mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 23:13:18 +00:00
1e24b22ef4
- Bug 1150366 - Remove duplicate d3.js. r=jsantell (71f991da6) - Bug 1175352 - Refactor LoadInfo arguments to be more self contained (r=bent) (3f7d08164) - Bug 1181533 - Add nsCRTGlue.h and prtime.h includes to nsDownloadManager.cpp to fix --disable-safe-browsing build bustage. r=froydnj (af338edf1) - Bug 905127 - Part 1 - Make some functions from nsNetUtil not inline. r=jduell Bug 905127 - Part 2 - remove unnecessary nsNetUtil.h includes r=jduell Bug 905127 - Make some functions from nsNetUtil not inline. r=jduell (bc47d5b3a) - Bug 1117650 - Part 1: Move all CORS tests into dom/security/test. r=sicking (6f727387c) - Bug 1117650 - Part 2: Move all MixedContent tests into dom/security/test. r=tanvi (73f273829) - Bug 1004703 - ignore 'unsafe-inline' if nonce- or hash-source specifed - tests (r=sstamm) (ebf411159) - Bug 921493 - CSP: test whitelisting of scheme-relative sources (r=dveditz) (f0618b189) - Bug 1139569 - Optimize update function for element editors in markup view;r=mratcliffe (c60d38dca) - Partil of Bug 1139644 - Make markupview use sdk timers instead of individual timers for each window;r=pbrosset (8bc1a4d66) - Bug 1146568 - Avoid unsafe CPOW usage warnings in browser_markupview_tag_edit_08.js; r=bgrins Making use of the devtools test frame-script to set the test node's attributes instead of using a CPOW. (61d7eed64) - Bug 1146568 - Avoid unsafe CPOW usage in markupview tests, in assertAttributes helper; r=bgrins (efc492d5d) - Bug 858038 - Allow moving elements in the markupview by drag/drop; r=pbrosset (51d79c15c) - Bug 1139644 - Flash only relevant attributes in markup view when changed;r=pbrosset (29807fa46) - Bug 1147128 - Make sure attribute shows up in markup view after removing and setting to the previous value;r=mratcliffe (1947f7417) - Bug 1147325 - Clear box model timer on markup view destroy. r=pbrosset Prevents 'this._inspector.toolbox is null' spam in mochitest-dt (1d6808b4a) - Bug 921102 - 1 - Linkify URIs in the inspector; r=tromey, miker This first part adds a parser for node attributes which, given some node information and an attribute name, generates a small AST-like array of objects that tells which parts of the attribute (if any) are links, and what they link to. Using this, the markup-view generates the right HTML structure to display these parts as links. This part 1 doesn't yet allow users to follow these links. (c500e270e) - Bug 1139667 - CSP tests for fetch(). r=ckirschb (df030457f) - Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions - tests (r=sstamm) (dee0f2239) - Bug 1117650 - Part 3: Move all CSP tests into dom/security/test. r=sstamm (29c95475c) - Bug 1146566 - 1 - Use devtools common frame-script in markupview tests and add helper; r=bgrins (b10e42468) - Bug 1146566 - 2 - Avoid using CPOWs in test browser_markupview_tag_edit_03.js; r=bgrins This change updates the browser_markupview_tag_edit_03.js test by making use of the getDomElementInfo message listener to retrieve information about the tested nodes without having to go through CPOWs. (07f0ee3ff) - Bug 1036324 - Adds option to walker.parents() to not traverse DocShellTreeItems of different types (24123a5d2) - Bug 921102 - 2 - Markup-view tests for attribute links; r=miker (f6da81799) - Bug 901250 - Add scroll into view menu item for the inspector. r=bgrins (bfc7518b1) - Bug 994055 - Part 1: Add a toggle sidebar panel button to the inspector. r=miker This adds a new icon, next to the searchbox (like in the debugger) to expand or collapse the sidebar panel in the inspector. The state is *not* persisted yet when the toolbox is closed. The button is hidden when the toolbox host switches to 'side'. (87730e20a) - Bug 994055 - Part 2: Add tests for the inspector sidebar toggle button. r=miker (2872c3fbd) - Bug 921102 - 3 - Open/copy markup-view attribute links; r=bgrins This part adds contextual menu items that become enabled when the user right clicks on an attribute that has a link. Depending on the nature of the link, a new tab will be opened or a node selected. The user can also choose to copy the link in the clipboard. (9b93485f6) - Bug 921102 - 4 - Tests for the open/copy links on markup-view attributes; r=bgrins (861ba51f6)
252 lines
8.3 KiB
C++
252 lines
8.3 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIInputStream.h"
|
|
#include "nsIStringStream.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsIFileURL.h"
|
|
#include "nsIJARURI.h"
|
|
#include "nsIResProtocolHandler.h"
|
|
#include "nsIChromeRegistry.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "StartupCacheUtils.h"
|
|
#include "mozilla/scache/StartupCache.h"
|
|
#include "mozilla/Omnijar.h"
|
|
|
|
namespace mozilla {
|
|
namespace scache {
|
|
|
|
NS_EXPORT nsresult
|
|
NewObjectInputStreamFromBuffer(char* buffer, uint32_t len,
|
|
nsIObjectInputStream** stream)
|
|
{
|
|
nsCOMPtr<nsIStringInputStream> stringStream
|
|
= do_CreateInstance("@mozilla.org/io/string-input-stream;1");
|
|
nsCOMPtr<nsIObjectInputStream> objectInput
|
|
= do_CreateInstance("@mozilla.org/binaryinputstream;1");
|
|
|
|
stringStream->AdoptData(buffer, len);
|
|
objectInput->SetInputStream(stringStream);
|
|
|
|
objectInput.forget(stream);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_EXPORT nsresult
|
|
NewObjectOutputWrappedStorageStream(nsIObjectOutputStream **wrapperStream,
|
|
nsIStorageStream** stream,
|
|
bool wantDebugStream)
|
|
{
|
|
nsCOMPtr<nsIStorageStream> storageStream;
|
|
|
|
nsresult rv = NS_NewStorageStream(256, UINT32_MAX, getter_AddRefs(storageStream));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIObjectOutputStream> objectOutput
|
|
= do_CreateInstance("@mozilla.org/binaryoutputstream;1");
|
|
nsCOMPtr<nsIOutputStream> outputStream
|
|
= do_QueryInterface(storageStream);
|
|
|
|
objectOutput->SetOutputStream(outputStream);
|
|
|
|
#ifdef DEBUG
|
|
if (wantDebugStream) {
|
|
// Wrap in debug stream to detect unsupported writes of
|
|
// multiply-referenced non-singleton objects
|
|
StartupCache* sc = StartupCache::GetSingleton();
|
|
NS_ENSURE_TRUE(sc, NS_ERROR_UNEXPECTED);
|
|
nsCOMPtr<nsIObjectOutputStream> debugStream;
|
|
sc->GetDebugObjectOutputStream(objectOutput, getter_AddRefs(debugStream));
|
|
debugStream.forget(wrapperStream);
|
|
} else {
|
|
objectOutput.forget(wrapperStream);
|
|
}
|
|
#else
|
|
objectOutput.forget(wrapperStream);
|
|
#endif
|
|
|
|
storageStream.forget(stream);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_EXPORT nsresult
|
|
NewBufferFromStorageStream(nsIStorageStream *storageStream,
|
|
char** buffer, uint32_t* len)
|
|
{
|
|
nsresult rv;
|
|
nsCOMPtr<nsIInputStream> inputStream;
|
|
rv = storageStream->NewInputStream(0, getter_AddRefs(inputStream));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
uint64_t avail64;
|
|
rv = inputStream->Available(&avail64);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
NS_ENSURE_TRUE(avail64 <= UINT32_MAX, NS_ERROR_FILE_TOO_BIG);
|
|
|
|
uint32_t avail = (uint32_t)avail64;
|
|
nsAutoArrayPtr<char> temp (new char[avail]);
|
|
uint32_t read;
|
|
rv = inputStream->Read(temp, avail, &read);
|
|
if (NS_SUCCEEDED(rv) && avail != read)
|
|
rv = NS_ERROR_UNEXPECTED;
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
*len = avail;
|
|
*buffer = temp.forget();
|
|
return NS_OK;
|
|
}
|
|
|
|
static const char baseName[2][5] = { "gre/", "app/" };
|
|
|
|
static inline bool
|
|
canonicalizeBase(nsAutoCString &spec,
|
|
nsACString &out)
|
|
{
|
|
nsAutoCString greBase, appBase;
|
|
nsresult rv = mozilla::Omnijar::GetURIString(mozilla::Omnijar::GRE, greBase);
|
|
if (NS_FAILED(rv) || !greBase.Length())
|
|
return false;
|
|
|
|
rv = mozilla::Omnijar::GetURIString(mozilla::Omnijar::APP, appBase);
|
|
if (NS_FAILED(rv))
|
|
return false;
|
|
|
|
bool underGre = !greBase.Compare(spec.get(), false, greBase.Length());
|
|
bool underApp = appBase.Length() &&
|
|
!appBase.Compare(spec.get(), false, appBase.Length());
|
|
|
|
if (!underGre && !underApp)
|
|
return false;
|
|
|
|
/**
|
|
* At this point, if both underGre and underApp are true, it can be one
|
|
* of the two following cases:
|
|
* - the GRE directory points to a subdirectory of the APP directory,
|
|
* meaning spec points under GRE.
|
|
* - the APP directory points to a subdirectory of the GRE directory,
|
|
* meaning spec points under APP.
|
|
* Checking the GRE and APP path length is enough to know in which case
|
|
* we are.
|
|
*/
|
|
if (underGre && underApp && greBase.Length() < appBase.Length())
|
|
underGre = false;
|
|
|
|
out.AppendLiteral("/resource/");
|
|
out.Append(baseName[underGre ? mozilla::Omnijar::GRE : mozilla::Omnijar::APP]);
|
|
out.Append(Substring(spec, underGre ? greBase.Length() : appBase.Length()));
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* PathifyURI transforms uris into useful zip paths
|
|
* to make it easier to manipulate startup cache entries
|
|
* using standard zip tools.
|
|
* Transformations applied:
|
|
* * resource:// URIs are resolved to their corresponding file/jar URI to
|
|
* canonicalize resources URIs other than gre and app.
|
|
* * Paths under GRE or APP directory have their base path replaced with
|
|
* resource/gre or resource/app to avoid depending on install location.
|
|
* * jar:file:///path/to/file.jar!/sub/path urls are replaced with
|
|
* /path/to/file.jar/sub/path
|
|
*
|
|
* The result is appended to the string passed in. Adding a prefix before
|
|
* calling is recommended to avoid colliding with other cache users.
|
|
*
|
|
* For example, in the js loader (string is prefixed with jsloader by caller):
|
|
* resource://gre/modules/XPCOMUtils.jsm or
|
|
* file://$GRE_DIR/modules/XPCOMUtils.jsm or
|
|
* jar:file://$GRE_DIR/omni.jar!/modules/XPCOMUtils.jsm becomes
|
|
* jsloader/resource/gre/modules/XPCOMUtils.jsm
|
|
* file://$PROFILE_DIR/extensions/{uuid}/components/component.js becomes
|
|
* jsloader/$PROFILE_DIR/extensions/%7Buuid%7D/components/component.js
|
|
* jar:file://$PROFILE_DIR/extensions/some.xpi!/components/component.js becomes
|
|
* jsloader/$PROFILE_DIR/extensions/some.xpi/components/component.js
|
|
*/
|
|
NS_EXPORT nsresult
|
|
PathifyURI(nsIURI *in, nsACString &out)
|
|
{
|
|
bool equals;
|
|
nsresult rv;
|
|
nsCOMPtr<nsIURI> uri = in;
|
|
nsAutoCString spec;
|
|
|
|
// Resolve resource:// URIs. At the end of this if/else block, we
|
|
// have both spec and uri variables identifying the same URI.
|
|
if (NS_SUCCEEDED(in->SchemeIs("resource", &equals)) && equals) {
|
|
nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIProtocolHandler> ph;
|
|
rv = ioService->GetProtocolHandler("resource", getter_AddRefs(ph));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIResProtocolHandler> irph(do_QueryInterface(ph, &rv));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = irph->ResolveURI(in, spec);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = ioService->NewURI(spec, nullptr, nullptr, getter_AddRefs(uri));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
} else {
|
|
if (NS_SUCCEEDED(in->SchemeIs("chrome", &equals)) && equals) {
|
|
nsCOMPtr<nsIChromeRegistry> chromeReg =
|
|
mozilla::services::GetChromeRegistryService();
|
|
if (!chromeReg)
|
|
return NS_ERROR_UNEXPECTED;
|
|
|
|
rv = chromeReg->ConvertChromeURL(in, getter_AddRefs(uri));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
rv = uri->GetSpec(spec);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
if (!canonicalizeBase(spec, out)) {
|
|
if (NS_SUCCEEDED(uri->SchemeIs("file", &equals)) && equals) {
|
|
nsCOMPtr<nsIFileURL> baseFileURL;
|
|
baseFileURL = do_QueryInterface(uri, &rv);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsAutoCString path;
|
|
rv = baseFileURL->GetPath(path);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
out.Append(path);
|
|
} else if (NS_SUCCEEDED(uri->SchemeIs("jar", &equals)) && equals) {
|
|
nsCOMPtr<nsIJARURI> jarURI = do_QueryInterface(uri, &rv);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIURI> jarFileURI;
|
|
rv = jarURI->GetJARFile(getter_AddRefs(jarFileURI));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = PathifyURI(jarFileURI, out);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsAutoCString path;
|
|
rv = jarURI->GetJAREntry(path);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
out.Append('/');
|
|
out.Append(path);
|
|
} else { // Very unlikely
|
|
nsAutoCString spec;
|
|
rv = uri->GetSpec(spec);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
out.Append('/');
|
|
out.Append(spec);
|
|
}
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace scache
|
|
} // namespace mozilla
|