mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1207494 - Part 8: Remove use of expression closure from dom/identity/. r=ferjm (34fac889f8) - minor crash thing (13fe2827c2) - Bug 1243359 - initialize mScrollSeriesNumber in all ScrollWheelInput constructors. r=roc (94163d8eca) - fix misspatch (b380a7bbe4) - Bug 1207412 - Make SystemTimeConverter use TimeStamp::Now() when converting times; r=karlt (f408549605) - Bug 1212102 - Drop unnecessary assertion comparing timestamps in SystemTimeConverter; r=karlt (1efaa04b3f) - Bug 1241302 - Slightly modernize this code. r=jst (c1e97bc069) - bug 1216916 clean up when InvokeDragSessionWithImage/Selection() fails r=roc (9cdf71b717) - Bug 1231329 - run ConvertToUnscaledDevPixels if *aPresContext is valid. r=roc (d10f23633b) - Bug 1245927: Innerize before creating DOM files from the file picker. r=baku (8754128362) - Bug 1155214 - Mark nsIBidiKeyboard as builtinclass; r=mrbkap (2d00326d2b) - reorder (c3c1ba92c9) - Bug 1236566 - add override declarations for widget/windows/GfxInfo.h; r=roc (940b40ed91) - Bug 1242659: Part 1. More information on the mismatches. r=jrmuizel (78331ddad2) - Block some Radeon drivers that crash on D3D9. (bug 1213107, r=jrmuizel) (482b66d313) - Bug 1203199 - Blacklist DXVA on some older intel drivers for causing crashes. r=jrmuizel (f1827d4498) - Bug 1203199 - Fix driver range with blacklist to avoid blacklisting other OSes. (2c2d547296) - Bug 1203199 - Bustage fix. CLOSED TREE (3233d407f3) - Bug 1178385. Enable DXVA on the G45 r=ajones (3c59a58a15) - Bug 1188442 IMMHandler::GetSelection() should use static Selection instance when IME doesn't have focus and return its or mSelection's reference r=emk (5cc4b30433) - Bug 1238899 Create hidden native caret for ATOK at composing in windowless plugin r=m_kato (40ef5bb4aa) - Bug 1257919 part 1. Kill off nsIXSLTException. r=khuey (11f37643f2) - Bug 1242072 - Change implementation of BaseProxyHandler::get() to follow ES6 [[Get]] specification. r=jorendorff (094a67f284) - Bug 489636 - Add a GC u-bench test for property tree splitting via deletion; r=sfink (9282fec25f) - Bug 1257919 part 2. Make nsIException and nsIStackFrame builtinclass, so we can start using [implicit_jscontext] on them. r=khuey (0e65fb8554) - Bug 1257919 part 3. Make the various toString methods on exceptions take an explicit JSContext. r=khuey (b342fb4930) - Bug 1257919 part 4. Stop returning StackFrame instances from exceptions::CreateStack. C++ callers of GetCurrentJSStack or exceptions::CreateStack always check for null anyway, and none of them seem to want this non-JS thing. r=khuey (d34036ccf9) - Bug 1257919 part 5. Get rid of the now-unused StackFrame class. r=khuey (aa13af0dfe) - Bug 1141222 - Create ScriptError with stack from Cu.reportError. r=bholley (b83ad26aa0) - Bug 1208641 - Extract stack from DOM/XPC exception. r=bholley (e382b5f48c) - Bug 1254380 part 1. Find the relevant window when the compartment we've got is an addon sandbox compartment in AutoJSAPI exception/warning reporting code. r=bholley (4b1f6c64a9) - Bug 1250630 - remove PBackgroundTest and ifdef ENABLE_TEST blocks. r=khuey (d7b36860a3) - Bug 1250963 part 1. Change NotifyRunnable::Dispatch to not require a JSContext. r=khuey (48e03c2fc2) - Bug 1250963 part 2. Remove the unused JSContext argument of WorkerPrivate::ModifyBusyCount. r=khuey (0f5ca42be1) - Bug 1250291 part 1. Stop pretending to report exceptions in MainThreadStopSyncLoopRunnable::PostDispatch. r=khuey (6e1c81cc06) - Bug 1250291 part 2. Stop pretending to report exceptions in MainThreadWorkerSyncRunnable::PostDispatch. r=khuey (f3d846ea31) - Bug 1250291 part 3. Stop pretending to report exceptions in WorkerDebuggerRunnable::PostDispatch. r=khuey (10bc1710d1) - Bug 1250975. Stop passing a JSContext argument to WorkerRunnable::PreDispatch and its overrides. r=khuey (71ab9046f0) - Bug 1255298. Just pass through the JSContext when passing through the NotificationOptions in notification code. r=wchen (552ae8e33e) - Bug 1250185 part 2. Remove some JSContext stuff that's no longer needed in Notification code. r=khuey (20b99ef28b) - Bug 1251045 part 8. Remove the JSContext argument from some nsINotificationStorageCallback methods. r=khuey (170c4afabc) - Bug 1227015 P7 Supress unused ErrorResult exception if the worker runnable failed to dispatch. r=catalinb (23a3cc6f45) - Bug 1251045 part 3. Remove the JSContext argument of WorkerRunnable::PostDispatch and its overrides. r=khuey (6a666d1a4a) - Bug 1251045 part 2. Remove the JSContext argument of ModifyBusyCountFromWorker. r=khuey (105bc4f59e) - Bug 1252130. Remove unnecessary JSContext argument from NotificationWorkerRunnable::WorkerRunInternal. r=khuey (642727f6f6) - Bug 1252127. Remove unnecessary JSContext argument from PromiseWorkerProxy::CleanUp. r=khuey (339e1157d1) - Bug 1251045 part 1. Make it possible to dispatch a ModifyBusyCountRunnable without a JSContext. r=khuey (665c1f81b4) - Bug 1251045 part 4. Remove the JSContext argument of WorkerRunnable::Dispatch. r=khuey (6c5cdab2b7) - Bug 1250185 part 1. nsIStructuredCloneContainer.initFromBase64 doesn't need a JSContext argument. r=khuey (d63a219209) - fix (773c0393aa) - Bug 1251045 part 5. Remove the JSContext argument from WorkerPrivateParent::Freeze/Thaw. r=khuey (cd419bfd2c) - Bug 1251045 part 6. Remove the JSContext argument from some worker debugger methods that no longer need it. r=khuey (abcc437cb9) - Bug 1251045 part 7. Remove the JSContext argument from some worker methods that no longer need it. r=khuey (3ddcbca08c) - Bug 1249652 part 1. Add a method on ErrorResult to steal an exception, if any, from a JSContext. r=khuey (9c07f5044b) - Bug 1229071 - importScripts should throw the correct error result in case the loading of one of scripts fails, r=bz (cd37645d76) - Bug 1229970 Abort script loading start requests if a load has been canceled. r=khuey (a44d9128ca) - Bug 1233171 Cancel channel when ScriptLoader is aborted during service worker script load. r=khuey (3b6ceafec7) - Bug 1249351 part 1. When doing importScripts of multiple scripts in a service worker, make sure to track the cache streams per-loadinfo, instead of trying to make them all wait on the same stream. r=bkelly (e1ccea9685) - Bug 1157544 - Fix a typo in the test; r=baku (8c0bf8f504) - Bug 1249351 part 2. Clean up test_importscript.html and add multiple-url importScript() case. r=bz (52b0a31032) - Bug 1249652 part 2. ScriptExecutorRunnable::WorkerRun should immediately move JS exceptions to its ErrorResult instead of allowing them to linger on the JSContext. r=baku,khuey (f628d3c8ba) - Bug 1249652 part 3. Simplify way we handle canceling when ScriptLoaderRunnable::RunInternal fails by canceling things with its actual failure code, so we don't have to guess which failed loads are actual failures and which are just canceled via this mechanism. r=baku,khuey (388543fbc3) - Bug 1251369. Use an AutoJSAPI that reports its own exceptions around the main runloop in workers. r=khuey (28b33287cd) - Bug 1251518. Fix js::ErrorReportToString to make a bit more sense, and change worker code to not use it anyway, so it matches the mainthread code. r=bholley,terrence (a48a40de90) - Bug 1254380 part 2. Go ahead and log the stack from our exception in AutoJSAPI::ReportException even if we don't have a window. r=bholley (64532b6017) - Bug 1212328 - Clean up some JSErrorReport-related code. r=Waldo,bz (d5aa611edc) - Bug 1255192 part 1. Remove the JSContext argument of JS::ExceptionStackOrNull. r=bholley (39b631d5ad) - bug 1252687 - make the ctor for CycleCollectorStats constexpr r=mccr8 (9e8168d8ac) - Bug 1254380 part 3. Skip firing error events for mainthread out of memory exceptions via AutoJSAPI::ReportException. r=bholley (d5e4e7dc29) - Bug 1254230 kinda-fix. Make sure to never send script errors with stacks attached to the console service if the associated windows have already had FreeInnerObjects called on them. r=bholley (8c379fe0e0) - Bug 1255192 part 2. Clean up the JSContext usage around xpc::FindExceptionStackForConsoleReport now that it just needs a JSContext for rooting. r=bholley (cade862491) - Bug 1255201. Improve the stack handling in nsXPCComponents_Utils::ReportError for the DOMException case to include the stack from the DOMException. r=bholley (fc6c065284) - Bug 1257919 part 6. Make the filename getter on JSStackFrame take an explicit JSContext. r=khuey (cde115b789) - Bug 1257919 part 7. Make the name getter on JSStackFrame take an explicit JSContext. r=khuey (d7466e9eab) - Bug 1257919 part 8. Make the line/column number getters on JSStackFrame take an explicit JSContext. r=khuey (b8766b98b2) - Bug 1257919 part 9. Make the asyncCause/asyncCaller getters on JSStackFrame take an explicit JSContext. r=khuey (b776ff9c6d) - Bug 1257919 part 10. Make the caller and formattedStack getters on JSStackFrame take an explicit JSContext. r=khuey (dc4d3d9091) - Bug 1252091. Add/RemoveFeature don't need a JSContext argument. r=khuey (5be6253a67) - Bug 1252123. Remove some unnecessary JSContext arguments from worker ScriptLoader methods. r=khuey (1657a35268) - Bug 1255181. Remove AutoJSAPI::InitWithLegacyErrorReporting. r=bholley (5ee7ac506e) - Bug 1254847 part 1. Take ownership of error reporting on the AutoEntryScript in nsXPCWrappedJSClass::DelegatedQueryInterface. r=bholley (62d987b030) - make style wrong again.... (fa4e6cfbc1) - Bug 1254847 part 2. Change nsJSNPRuntime to always use AutoEntryScript and always take ownership of error reporting. r=bholley (d24cb80622) - Bug 1251655 - Remove support for JavaScript-global-constructor-prototype-alias. r=bz. (2b354ea423) - Bug 1251655 - Remove support for JavaScript-DOM-class and JavaScript-DOM-interface. r=bz. (dd6786ea57) - Bug 1251275. Switch to using an AutoEntryScript in WorkerPrivate::RunExpiredTimeouts. r=khuey (f10d1b0dec) - Bug 1072144 part 1. Just release-assert that Promise::Resolve does not fail in service worker code. It can only do that on OOM or overrecursion anyway, and overrecursion is not likely if we're coming right off a runnable. r=khuey (ba4c89a3bc) - Bug 1072144 part 2. When UnregisterWorker tries to ScheduleWorker and that throws, just suppress the exception: there is no good place to report it anyway. r=khuey (ca563ec5cd) - Bug 1072144 part 3. Hoist the exception reporting out of WorkerRunnable::PostRun into WorkerRunnable::Run and make it unconditional. r=khuey (9914acd4a6) - Bug 1252221. When GetOrCreateGlobalScope fails while trying to run a ScriptExecutorRunnable::WorkerRun, just suppress the exception, because there is no way to report it without a compartment to work with. r=khuey (abcc9df148) - Bug 1072144 part 4. Add a WorkerRunnable::PreRun so that we can move worker global creation to it and always have an AutoEntryScript by the time we're evaluating the main worker script. r=khuey (007b528868) - Bug 1251276 part 1. Change WorkerPrivate::CancelAllTimeouts to no longer call RunExpiredTimeouts. r=khuey (6b937370a1) - Bug 1251276 part 2. Remove the JSContext argument of WorkerPrivate::CancelAllTimeouts. r=khuey (336b788e03) - Bug 1251380. Change things so that WorkerPrivate::NotifyInternal (hopefully) never throws. r=khuey (1d4863f83a) - Bug 1254846. Add an AutoEntryScript constructor that takes a JSObject instead of an nsIGlobalObject, for convenience. r=bholley (693857f9b0) - Bug 1255706 part 1. Remove JSContext argument from WorkerPrivate constructor. r=khuey (0486bdb01c) - Bug 1255706 part 2. Remove JSContext argument from WorkerPrivate::Terminate. r=khuey (f0b62de092) - Bug 1257568. Remove the JSContext argument of WorkerPrivate::Kill. r=khuey (ebe7d247b5) - Bug 1252189. Remove the unnecessary JSContext argument from WorkerPrivate::FreezeInternal/ThawInternal. r=khuey (22b137b05e) - Bug 1119490 - Expose the URL constructor to WorkerDebuggerGlobalScope;r=khuey (6f4fc13e1e) - Bug 1241841 - Clear the worker's debugger event queue before destroying its context;r=khuey (a1e8dd4b2d) - Bug 1249950 - Add Performance Markers for MessagePort - patch 1 - remove non-useful 'explicit', r=smaug (8a014b53e6) - Bug 1249950 - Add Performance Markers for MessagePort - patch 2, r=smaug, r=vporof (560caf0ae1) - bug 1250486 - make the ComponentsSH ctor constexpr r=bz (1c441dbb0f) - Bug 1257032: Make files in dom/workers actually build without unification. r=baku (6ab4ae0b65) - Bug 1241522 - handle OOM in nsExpatDriver::HandleCharacterData; r=hsivonen (b652220cdc) - Bug 1219482: Replace PRLogModuleInfo with LazyLogModule in various files.r=benjamin (5fd5e8dbc8) - Bug 1238545 - Remove nsISimpleUnicharStreamFactory; r=froydnj (f0018c5b16) - Bug 1257335. Replace some AutoSafeJSContext uses with AutoJSAPI or AutoJSContext uses. r=bholley (7baf79deb7) - Bug 1247635 - Unify PostMessageRunnable and DispatchEventRunnable in MessagePort.cpp, r=smaug (df2765c215) - Bug 1250572 - Force a parent object in MessagePort/Channel and in StructuredCloneHolder, r=smaug (2a929d59d1) - Bug 1255375 - MessagePort should not leak if DispatchMessage() fails, r=smaug (0a5cdebfb0) - Bug 1251272. Remove the dead code in ReportErrorRunnable::ReportError that could fail, and make it infallible. r=khuey (89e80694d0) - Bug 1072144 part 5. Stop fiddling with compartments on the JSContext before calling PostRun in WorkerRunnable::Run. Add some documentation explaining what's going on. r=khuey (91f4bb6a7c) - Bug 1072144 part 6. Switch WorkerRunnable::Run to calling TakeOwnershipOfErrorReporting on its AutoJSAPI/AutoEntryScript and remove the remaining JS_ReportPendingException callers in worker code. r=khuey (405d9e0282) - Bug 1179548 - Close the windows opened in private browsing worker tests; r=baku (acf3430b69) - Bug 1179753 - Use pushPrefEnv more in worker tests; r=baku (4bfd949c72) - Bug 1134224 - More test for test_bug1132395.html, r=ehsan (626eb100cd) - Bug 1134224 - onerror for test_bug1132395.html, r=ehsan (147195f57e) - Bug 1207635 - get rid of dom.workers.sharedWorkers.enabled pref, r=khuey (22fe2965c6) - Bug 1252592. JS warnings should not trigger error events on shared workers. r=khuey (7f05c2c00d) - Bug 1251308; r=luke (3cbec95738) - Bug 1246838 - Handle const qualifiers and references better in Variant. r=waldo (30da6e3ebf) - Bug 1254565 - Allow passing matchers as rvalues to Variant::match. r=froydnj (1dd799fb0a) - Bug 1246841 - Allow construction of Variant values using type inference. r=waldo (6ba3e6704c) - Bug 1250666 - Forward Variant's move constructor argument correctly to the underlying variant type. r=waldo (7353a53bf0) - Bug 1252185. Remove the dead "target" variable from CloseEventRunnable::WorkerRun. r=khuey (be172da10b) - Bug 1253059: Use fallible allocation in the worker error reporter. r=baku (963222bdd4) - Bug 1253199 - MessagePort should handle the dispatching a message when the parent window is gone, r=smaug (d552e3cd9e) - Bug 1252839 - Remove some if stmt after allocation with 'new' - patch 2, r=bz (3c7eb959bc) - Bug 1252839 - Remove some if stmt after allocation with 'new' - patch 1, r=bz (85067dbfb6) - Bug 1254855. Switch AutoEntryScripts in nsDirectoryViewer to take ownership of error reporting. r=bholley (8c10532323) - Bug 1252565 part 1. Push the script environment preparer bits up from XPCJSRuntime to CycleCollectedJSRuntime, because we need them on workers to do ctypes on workers properly. r=bholley (aecf2595dd) - Bug 1252565 part 2. Make dom::WarningOnlyErrorReporter handle workers. r=bholley (f415b8868b) - Bug 1244222 - Check for function interfaces in DelegatedQueryInterface. r=bz (d213eec83c) - Bug 1254393. Take ownership of error reporting on the AutoEntryScript in nsXPCWrappedJSClass::CallMethod. r=bholley (4765b501c0) - Bug 1251769 - Remove remaining references to MOZILLA_XPCOMRT_API from mfbt. r=froydnj (236adc1d4c) - Bug 1247835 (part 0) - Minor comment and style tweaks in BinarySearch.h. r=luke. (db04793721) - Bug 1244074 - Part 1: Move SheetParsingMode to a separate file. r=dholbert (290adaadea) - Bug 1244074 - Part 2: Add HandleRefPtr for refcounting StyleSheetHandles. r=dholbert r=waldo (8549b24392) - Bug 1244068 - Part 1: Add enum to represent the style system backend type. r=dholbert (c2e53feaf2) - Bug 1244068 - Part 2: Add skeleton ServoStyleSet and a StyleSetHandle smart pointer. r=dholbert (71a5c28629) - Bug 1244068 - Part 3: Factor out nsStyleSet getting in RestyleManager/ElementRestyler. r=dholbert (9e9f4f2e80) - Bug 1245406: In ReflowBlockFrame, use Maybe<> to destroy & reconstruct a stack-allocated object, instead of an explicit call to destructor & placement 'new'. r=dbaron (d36858b818) - Bug 1244068 - Part 4: Use StyleSetHandle instead of concrete style set class in most places. r=dholbert (93f9bcf799) - Bug 1244074 - Part 3: Add skeleton ServoStyleSheet and a StyleSheetHandle smart pointer. r=dholbert (5b4fbdce38) - Bug 1195173 - Apply CSP to preloaded styles within layout/style/Loader.cpp (r=bz) (d1ba920fd3) - Bug 1245681 - Fix addOverrideStyleSheet. r=bz (64099eac73) - Bug 1244074 - Part 4: Use StyleSheetHandle instead of concrete style sheet class in most places. r=dholberti (867470ac83) - Bug 1246013 (part 1) - Store a copy of the ETLDEntry directly in DomainEntry instead of a pointer to it. r=jduell. (587b3a9fb7) - Bug 1246013 (part 2) - Change "explicit/xpcom/effective-TLD-service" path to the more sensible "explicit/network/effective-TLD-service". r=jduell. (2e0df6f28f) - Bug 1247835 (part 1) - Use binary search instead of a hash table in nsEffectiveTLDService. r=jduell. (685dae01c0) - Bug 1257121 part 1 - Use struct for passing some params of font metrics. r=jfkthame (1dfd7a7429) - Bug 1257121 part 2 - Merge nsFontMetrics::Init to the constructor and remove unused failure handling code. r=jfkthame (0cdc441511) - Bug 1257121 part 3 - Add GetInflatedFontMetricsForFrame function to simplify a common use pattern. r=jfkthame (d9630ebd1b) - Bug 1257121 part 4 - Use return value rather than out param to retur font metrics. r=jfkthame (c9a5b1d1dd) - Bug 1257121 part 5 - Make nsDeviceContext::mFontCache a RefPtr. r=jfkthame (9c53238a6a)
This commit is contained in:
+172
-60
@@ -31,6 +31,7 @@
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsIPipe.h"
|
||||
#include "nsIOutputStream.h"
|
||||
#include "nsPrintfCString.h"
|
||||
#include "nsScriptLoader.h"
|
||||
#include "nsString.h"
|
||||
#include "nsStreamUtils.h"
|
||||
@@ -41,6 +42,7 @@
|
||||
|
||||
#include "mozilla/Assertions.h"
|
||||
#include "mozilla/LoadContext.h"
|
||||
#include "mozilla/Maybe.h"
|
||||
#include "mozilla/ipc/BackgroundUtils.h"
|
||||
#include "mozilla/dom/CacheBinding.h"
|
||||
#include "mozilla/dom/cache/CacheTypes.h"
|
||||
@@ -52,6 +54,7 @@
|
||||
#include "mozilla/dom/Promise.h"
|
||||
#include "mozilla/dom/PromiseNativeHandler.h"
|
||||
#include "mozilla/dom/Response.h"
|
||||
#include "mozilla/dom/ScriptSettings.h"
|
||||
#include "mozilla/UniquePtr.h"
|
||||
#include "Principal.h"
|
||||
#include "WorkerFeature.h"
|
||||
@@ -63,13 +66,11 @@
|
||||
|
||||
USING_WORKERS_NAMESPACE
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::dom;
|
||||
using mozilla::dom::cache::Cache;
|
||||
using mozilla::dom::cache::CacheStorage;
|
||||
using mozilla::dom::Promise;
|
||||
using mozilla::dom::PromiseNativeHandler;
|
||||
using mozilla::ErrorResult;
|
||||
using mozilla::ipc::PrincipalInfo;
|
||||
using mozilla::UniquePtr;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -240,6 +241,10 @@ struct ScriptLoadInfo
|
||||
// resolution.
|
||||
RefPtr<Promise> mCachePromise;
|
||||
|
||||
// The reader stream the cache entry should be filled from, for those cases
|
||||
// when we're going to have an mCachePromise.
|
||||
nsCOMPtr<nsIInputStream> mCacheReadStream;
|
||||
|
||||
nsCOMPtr<nsIChannel> mChannel;
|
||||
char16_t* mScriptTextBuf;
|
||||
size_t mScriptTextLength;
|
||||
@@ -302,6 +307,9 @@ private:
|
||||
virtual bool
|
||||
IsDebuggerRunnable() const override;
|
||||
|
||||
virtual bool
|
||||
PreRun(WorkerPrivate* aWorkerPrivate) override;
|
||||
|
||||
virtual bool
|
||||
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override;
|
||||
|
||||
@@ -533,7 +541,6 @@ class ScriptLoaderRunnable final : public WorkerFeature
|
||||
nsCOMPtr<nsIEventTarget> mSyncLoopTarget;
|
||||
nsTArray<ScriptLoadInfo> mLoadInfos;
|
||||
RefPtr<CacheCreator> mCacheCreator;
|
||||
nsCOMPtr<nsIInputStream> mReader;
|
||||
bool mIsMainScript;
|
||||
WorkerScriptType mWorkerScriptType;
|
||||
bool mCanceled;
|
||||
@@ -569,8 +576,9 @@ private:
|
||||
{
|
||||
AssertIsOnMainThread();
|
||||
|
||||
if (NS_FAILED(RunInternal())) {
|
||||
CancelMainThread();
|
||||
nsresult rv = RunInternal();
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
CancelMainThread(rv);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
@@ -625,6 +633,13 @@ private:
|
||||
AssertIsOnMainThread();
|
||||
MOZ_ASSERT(aIndex < mLoadInfos.Length());
|
||||
|
||||
// If one load info cancels or hits an error, it can race with the start
|
||||
// callback coming from another load info.
|
||||
if (mCanceledMainThread || !mCacheCreator) {
|
||||
aRequest->Cancel(NS_ERROR_FAILURE);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
ScriptLoadInfo& loadInfo = mLoadInfos[aIndex];
|
||||
|
||||
nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
|
||||
@@ -633,7 +648,10 @@ private:
|
||||
// We synthesize the result code, but its never exposed to content.
|
||||
RefPtr<mozilla::dom::InternalResponse> ir =
|
||||
new mozilla::dom::InternalResponse(200, NS_LITERAL_CSTRING("OK"));
|
||||
ir->SetBody(mReader);
|
||||
ir->SetBody(loadInfo.mCacheReadStream);
|
||||
// Drop our reference to the stream now that we've passed it along, so it
|
||||
// doesn't hang around once the cache is done with it and keep data alive.
|
||||
loadInfo.mCacheReadStream = nullptr;
|
||||
|
||||
// Set the channel info of the channel on the response so that it's
|
||||
// saved in the cache.
|
||||
@@ -697,7 +715,8 @@ private:
|
||||
mCanceled = true;
|
||||
|
||||
nsCOMPtr<nsIRunnable> runnable =
|
||||
NS_NewRunnableMethod(this, &ScriptLoaderRunnable::CancelMainThread);
|
||||
NS_NewRunnableMethod(this,
|
||||
&ScriptLoaderRunnable::CancelMainThreadWithBindingAborted);
|
||||
NS_ASSERTION(runnable, "This should never fail!");
|
||||
|
||||
if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
|
||||
@@ -716,7 +735,13 @@ private:
|
||||
}
|
||||
|
||||
void
|
||||
CancelMainThread()
|
||||
CancelMainThreadWithBindingAborted()
|
||||
{
|
||||
CancelMainThread(NS_BINDING_ABORTED);
|
||||
}
|
||||
|
||||
void
|
||||
CancelMainThread(nsresult aCancelResult)
|
||||
{
|
||||
AssertIsOnMainThread();
|
||||
|
||||
@@ -741,13 +766,13 @@ private:
|
||||
|
||||
if (loadInfo.mCachePromise) {
|
||||
MOZ_ASSERT(mWorkerPrivate->IsServiceWorker());
|
||||
loadInfo.mCachePromise->MaybeReject(NS_BINDING_ABORTED);
|
||||
loadInfo.mCachePromise->MaybeReject(aCancelResult);
|
||||
loadInfo.mCachePromise = nullptr;
|
||||
callLoadingFinished = false;
|
||||
}
|
||||
|
||||
if (loadInfo.mChannel) {
|
||||
if (NS_SUCCEEDED(loadInfo.mChannel->Cancel(NS_BINDING_ABORTED))) {
|
||||
if (NS_SUCCEEDED(loadInfo.mChannel->Cancel(aCancelResult))) {
|
||||
callLoadingFinished = false;
|
||||
} else {
|
||||
NS_WARNING("Failed to cancel channel!");
|
||||
@@ -755,7 +780,7 @@ private:
|
||||
}
|
||||
|
||||
if (callLoadingFinished && !loadInfo.Finished()) {
|
||||
LoadingFinished(index, NS_BINDING_ABORTED);
|
||||
LoadingFinished(index, aCancelResult);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -909,7 +934,8 @@ private:
|
||||
// In case we return early.
|
||||
loadInfo.mCacheStatus = ScriptLoadInfo::Cancel;
|
||||
|
||||
rv = NS_NewPipe(getter_AddRefs(mReader), getter_AddRefs(writer), 0,
|
||||
rv = NS_NewPipe(getter_AddRefs(loadInfo.mCacheReadStream),
|
||||
getter_AddRefs(writer), 0,
|
||||
UINT32_MAX, // unlimited size to avoid writer WOULD_BLOCK case
|
||||
true, false); // non-blocking reader, blocking writer
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
@@ -1232,7 +1258,7 @@ private:
|
||||
RefPtr<ScriptExecutorRunnable> runnable =
|
||||
new ScriptExecutorRunnable(*this, mSyncLoopTarget, IsMainWorkerScript(),
|
||||
firstIndex, lastIndex);
|
||||
if (!runnable->Dispatch(nullptr)) {
|
||||
if (!runnable->Dispatch()) {
|
||||
MOZ_ASSERT(false, "This should never fail!");
|
||||
}
|
||||
}
|
||||
@@ -1662,7 +1688,7 @@ public:
|
||||
RefPtr<MainThreadStopSyncLoopRunnable> runnable =
|
||||
new MainThreadStopSyncLoopRunnable(mParentWorker,
|
||||
mSyncLoopTarget.forget(), true);
|
||||
if (!runnable->Dispatch(nullptr)) {
|
||||
if (!runnable->Dispatch()) {
|
||||
NS_ERROR("This should never fail!");
|
||||
}
|
||||
|
||||
@@ -1703,9 +1729,46 @@ ScriptExecutorRunnable::IsDebuggerRunnable() const
|
||||
return mScriptLoader.mWorkerScriptType == DebuggerScript;
|
||||
}
|
||||
|
||||
bool
|
||||
ScriptExecutorRunnable::PreRun(WorkerPrivate* aWorkerPrivate)
|
||||
{
|
||||
aWorkerPrivate->AssertIsOnWorkerThread();
|
||||
|
||||
if (!mIsWorkerScript) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!aWorkerPrivate->GetJSContext()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
MOZ_ASSERT(mFirstIndex == 0);
|
||||
MOZ_ASSERT(!mScriptLoader.mRv.Failed());
|
||||
|
||||
AutoJSAPI jsapi;
|
||||
jsapi.Init();
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
|
||||
WorkerGlobalScope* globalScope =
|
||||
aWorkerPrivate->GetOrCreateGlobalScope(jsapi.cx());
|
||||
if (NS_WARN_IF(!globalScope)) {
|
||||
NS_WARNING("Failed to make global!");
|
||||
// There's no way to report the exception on jsapi right now, because there
|
||||
// is no way to even enter a compartment on this thread anymore. Just clear
|
||||
// the exception. We'll report some sort of error to our caller thread in
|
||||
// ShutdownScriptLoader.
|
||||
jsapi.ClearException();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
ScriptExecutorRunnable::WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
|
||||
{
|
||||
aWorkerPrivate->AssertIsOnWorkerThread();
|
||||
|
||||
nsTArray<ScriptLoadInfo>& loadInfos = mScriptLoader.mLoadInfos;
|
||||
|
||||
// Don't run if something else has already failed.
|
||||
@@ -1720,25 +1783,14 @@ ScriptExecutorRunnable::WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
|
||||
}
|
||||
}
|
||||
|
||||
JS::Rooted<JSObject*> global(aCx);
|
||||
|
||||
if (mIsWorkerScript) {
|
||||
WorkerGlobalScope* globalScope =
|
||||
aWorkerPrivate->GetOrCreateGlobalScope(aCx);
|
||||
if (NS_WARN_IF(!globalScope)) {
|
||||
NS_WARNING("Failed to make global!");
|
||||
return false;
|
||||
}
|
||||
|
||||
global.set(globalScope->GetWrapper());
|
||||
} else {
|
||||
global.set(JS::CurrentGlobalOrNull(aCx));
|
||||
}
|
||||
// If nothing else has failed, our ErrorResult better not be a failure either.
|
||||
MOZ_ASSERT(!mScriptLoader.mRv.Failed(), "Who failed it and why?");
|
||||
|
||||
// Slightly icky action at a distance, but there's no better place to stash
|
||||
// this value, really.
|
||||
JS::Rooted<JSObject*> global(aCx, JS::CurrentGlobalOrNull(aCx));
|
||||
MOZ_ASSERT(global);
|
||||
|
||||
JSAutoCompartment ac(aCx, global);
|
||||
|
||||
for (uint32_t index = mFirstIndex; index <= mLastIndex; index++) {
|
||||
ScriptLoadInfo& loadInfo = loadInfos.ElementAt(index);
|
||||
|
||||
@@ -1746,8 +1798,11 @@ ScriptExecutorRunnable::WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
|
||||
NS_ASSERTION(loadInfo.mExecutionScheduled, "Should be scheduled!");
|
||||
NS_ASSERTION(!loadInfo.mExecutionResult, "Should not have executed yet!");
|
||||
|
||||
MOZ_ASSERT(!mScriptLoader.mRv.Failed(), "Who failed it and why?");
|
||||
mScriptLoader.mRv.MightThrowJSException();
|
||||
if (NS_FAILED(loadInfo.mLoadResult)) {
|
||||
scriptloader::ReportLoadError(aCx, loadInfo.mLoadResult);
|
||||
scriptloader::ReportLoadError(mScriptLoader.mRv,
|
||||
loadInfo.mLoadResult, loadInfo.mURL);
|
||||
// Top level scripts only!
|
||||
if (mIsWorkerScript) {
|
||||
aWorkerPrivate->MaybeDispatchLoadFailedRunnable();
|
||||
@@ -1774,8 +1829,11 @@ ScriptExecutorRunnable::WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
|
||||
loadInfo.mScriptTextBuf = nullptr;
|
||||
loadInfo.mScriptTextLength = 0;
|
||||
|
||||
// Our ErrorResult still shouldn't be a failure.
|
||||
MOZ_ASSERT(!mScriptLoader.mRv.Failed(), "Who failed it and why?");
|
||||
JS::Rooted<JS::Value> unused(aCx);
|
||||
if (!JS::Evaluate(aCx, options, srcBuf, &unused)) {
|
||||
mScriptLoader.mRv.StealExceptionFromJSContext(aCx);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1789,6 +1847,9 @@ void
|
||||
ScriptExecutorRunnable::PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
|
||||
bool aRunResult)
|
||||
{
|
||||
aWorkerPrivate->AssertIsOnWorkerThread();
|
||||
MOZ_ASSERT(!JS_IsExceptionPending(aCx), "Who left an exception on there?");
|
||||
|
||||
nsTArray<ScriptLoadInfo>& loadInfos = mScriptLoader.mLoadInfos;
|
||||
|
||||
if (mLastIndex == loadInfos.Length() - 1) {
|
||||
@@ -1803,6 +1864,12 @@ ScriptExecutorRunnable::PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
|
||||
}
|
||||
}
|
||||
|
||||
// The only way we can get here with "result" false but without
|
||||
// mScriptLoader.mRv being a failure is if we're loading the main worker
|
||||
// script and GetOrCreateGlobalScope() fails. In that case we would have
|
||||
// returned false from WorkerRun, so assert that.
|
||||
MOZ_ASSERT_IF(!result && !mScriptLoader.mRv.Failed(),
|
||||
!aRunResult);
|
||||
ShutdownScriptLoader(aCx, aWorkerPrivate, result, mutedError);
|
||||
}
|
||||
}
|
||||
@@ -1823,6 +1890,8 @@ ScriptExecutorRunnable::ShutdownScriptLoader(JSContext* aCx,
|
||||
bool aResult,
|
||||
bool aMutedError)
|
||||
{
|
||||
aWorkerPrivate->AssertIsOnWorkerThread();
|
||||
|
||||
MOZ_ASSERT(mLastIndex == mScriptLoader.mLoadInfos.Length() - 1);
|
||||
|
||||
if (mIsWorkerScript && aWorkerPrivate->IsServiceWorker()) {
|
||||
@@ -1830,17 +1899,31 @@ ScriptExecutorRunnable::ShutdownScriptLoader(JSContext* aCx,
|
||||
}
|
||||
|
||||
if (!aResult) {
|
||||
// If this error has to be muted, we have to clear the pending exception,
|
||||
// if any, and use the ErrorResult object to throw a new exception.
|
||||
if (aMutedError && JS_IsExceptionPending(aCx)) {
|
||||
LogExceptionToConsole(aCx, aWorkerPrivate);
|
||||
mScriptLoader.mRv.Throw(NS_ERROR_FAILURE);
|
||||
// At this point there are two possibilities:
|
||||
//
|
||||
// 1) mScriptLoader.mRv.Failed(). In that case we just want to leave it
|
||||
// as-is, except if it has a JS exception and we need to mute JS
|
||||
// exceptions. In that case, we log the exception without firing any
|
||||
// events and then replace it on the ErrorResult with a generic
|
||||
// NS_ERROR_FAILURE for lack of anything better. XXXbz: This should
|
||||
// throw a NetworkError per spec updates. See bug 1249673.
|
||||
//
|
||||
// 2) mScriptLoader.mRv succeeded. As far as I can tell, this can only
|
||||
// happen when loading the main worker script and
|
||||
// GetOrCreateGlobalScope() fails or if ScriptExecutorRunnable::Cancel
|
||||
// got called. Does it matter what we throw in this case? I'm not
|
||||
// sure...
|
||||
if (mScriptLoader.mRv.Failed()) {
|
||||
if (aMutedError && mScriptLoader.mRv.IsJSException()) {
|
||||
LogExceptionToConsole(aCx, aWorkerPrivate);
|
||||
mScriptLoader.mRv.Throw(NS_ERROR_FAILURE);
|
||||
}
|
||||
} else {
|
||||
mScriptLoader.mRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
|
||||
}
|
||||
}
|
||||
|
||||
aWorkerPrivate->RemoveFeature(aCx, &mScriptLoader);
|
||||
aWorkerPrivate->RemoveFeature(&mScriptLoader);
|
||||
aWorkerPrivate->StopSyncLoop(mSyncLoopTarget, aResult);
|
||||
}
|
||||
|
||||
@@ -1850,12 +1933,16 @@ ScriptExecutorRunnable::LogExceptionToConsole(JSContext* aCx,
|
||||
{
|
||||
aWorkerPrivate->AssertIsOnWorkerThread();
|
||||
|
||||
MOZ_ASSERT(mScriptLoader.mRv.IsJSException());
|
||||
|
||||
JS::Rooted<JS::Value> exn(aCx);
|
||||
if (!JS_GetPendingException(aCx, &exn)) {
|
||||
if (!ToJSValue(aCx, mScriptLoader.mRv, &exn)) {
|
||||
return;
|
||||
}
|
||||
|
||||
JS_ClearPendingException(aCx);
|
||||
// Now the exception state should all be in exn.
|
||||
MOZ_ASSERT(!JS_IsExceptionPending(aCx));
|
||||
MOZ_ASSERT(!mScriptLoader.mRv.Failed());
|
||||
|
||||
js::ErrorReport report(aCx);
|
||||
if (!report.init(aCx, exn)) {
|
||||
@@ -1872,7 +1959,7 @@ ScriptExecutorRunnable::LogExceptionToConsole(JSContext* aCx,
|
||||
}
|
||||
|
||||
void
|
||||
LoadAllScripts(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
|
||||
LoadAllScripts(WorkerPrivate* aWorkerPrivate,
|
||||
nsTArray<ScriptLoadInfo>& aLoadInfos, bool aIsMainScript,
|
||||
WorkerScriptType aWorkerScriptType, ErrorResult& aRv)
|
||||
{
|
||||
@@ -1888,7 +1975,7 @@ LoadAllScripts(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
|
||||
|
||||
NS_ASSERTION(aLoadInfos.IsEmpty(), "Should have swapped!");
|
||||
|
||||
if (!aWorkerPrivate->AddFeature(aCx, loader)) {
|
||||
if (!aWorkerPrivate->AddFeature(loader)) {
|
||||
aRv.Throw(NS_ERROR_FAILURE);
|
||||
return;
|
||||
}
|
||||
@@ -1896,7 +1983,7 @@ LoadAllScripts(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
|
||||
if (NS_FAILED(NS_DispatchToMainThread(loader))) {
|
||||
NS_ERROR("Failed to dispatch!");
|
||||
|
||||
aWorkerPrivate->RemoveFeature(aCx, loader);
|
||||
aWorkerPrivate->RemoveFeature(loader);
|
||||
aRv.Throw(NS_ERROR_FAILURE);
|
||||
return;
|
||||
}
|
||||
@@ -1958,49 +2045,74 @@ ChannelFromScriptURLWorkerThread(JSContext* aCx,
|
||||
return getter->GetResult();
|
||||
}
|
||||
|
||||
void ReportLoadError(JSContext* aCx, nsresult aLoadResult)
|
||||
void ReportLoadError(ErrorResult& aRv, nsresult aLoadResult,
|
||||
const nsAString& aScriptURL)
|
||||
{
|
||||
switch (aLoadResult) {
|
||||
case NS_BINDING_ABORTED:
|
||||
// Canceled, don't set an exception.
|
||||
break;
|
||||
MOZ_ASSERT(!aRv.Failed());
|
||||
|
||||
switch (aLoadResult) {
|
||||
case NS_ERROR_FILE_NOT_FOUND:
|
||||
case NS_ERROR_NOT_AVAILABLE:
|
||||
Throw(aCx, NS_ERROR_DOM_NETWORK_ERR);
|
||||
aLoadResult = NS_ERROR_DOM_NETWORK_ERR;
|
||||
break;
|
||||
|
||||
case NS_ERROR_MALFORMED_URI:
|
||||
aLoadResult = NS_ERROR_DOM_SYNTAX_ERR;
|
||||
MOZ_FALLTHROUGH;
|
||||
break;
|
||||
|
||||
case NS_BINDING_ABORTED:
|
||||
// Note: we used to pretend like we didn't set an exception for
|
||||
// NS_BINDING_ABORTED, but then ShutdownScriptLoader did it anyway. The
|
||||
// other callsite, in WorkerPrivate::Constructor, never passed in
|
||||
// NS_BINDING_ABORTED. So just throw it directly here. Consumers will
|
||||
// deal as needed. But note that we do NOT want to ThrowDOMException()
|
||||
// for this case, because that will make it impossible for consumers to
|
||||
// realize that our error was NS_BINDING_ABORTED.
|
||||
aRv.Throw(aLoadResult);
|
||||
return;
|
||||
|
||||
case NS_ERROR_DOM_SECURITY_ERR:
|
||||
case NS_ERROR_DOM_SYNTAX_ERR:
|
||||
Throw(aCx, aLoadResult);
|
||||
break;
|
||||
|
||||
case NS_ERROR_DOM_BAD_URI:
|
||||
// This is actually a security error.
|
||||
aLoadResult = NS_ERROR_DOM_SECURITY_ERR;
|
||||
break;
|
||||
|
||||
default:
|
||||
JS_ReportError(aCx, "Failed to load script (nsresult = 0x%x)", aLoadResult);
|
||||
// For lack of anything better, go ahead and throw a NetworkError here.
|
||||
// We don't want to throw a JS exception, because for toplevel script
|
||||
// loads that would get squelched.
|
||||
aRv.ThrowDOMException(NS_ERROR_DOM_NETWORK_ERR,
|
||||
nsPrintfCString("Failed to load worker script at %s (nsresult = 0x%x)",
|
||||
NS_ConvertUTF16toUTF8(aScriptURL).get(),
|
||||
aLoadResult));
|
||||
return;
|
||||
}
|
||||
|
||||
aRv.ThrowDOMException(aLoadResult,
|
||||
NS_LITERAL_CSTRING("Failed to load worker script at \"") +
|
||||
NS_ConvertUTF16toUTF8(aScriptURL) +
|
||||
NS_LITERAL_CSTRING("\""));
|
||||
}
|
||||
|
||||
void
|
||||
LoadMainScript(JSContext* aCx, const nsAString& aScriptURL,
|
||||
LoadMainScript(WorkerPrivate* aWorkerPrivate,
|
||||
const nsAString& aScriptURL,
|
||||
WorkerScriptType aWorkerScriptType,
|
||||
ErrorResult& aRv)
|
||||
{
|
||||
WorkerPrivate* worker = GetWorkerPrivateFromContext(aCx);
|
||||
NS_ASSERTION(worker, "This should never be null!");
|
||||
|
||||
nsTArray<ScriptLoadInfo> loadInfos;
|
||||
|
||||
ScriptLoadInfo* info = loadInfos.AppendElement();
|
||||
info->mURL = aScriptURL;
|
||||
|
||||
LoadAllScripts(aCx, worker, loadInfos, true, aWorkerScriptType, aRv);
|
||||
LoadAllScripts(aWorkerPrivate, loadInfos, true, aWorkerScriptType, aRv);
|
||||
}
|
||||
|
||||
void
|
||||
Load(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
|
||||
Load(WorkerPrivate* aWorkerPrivate,
|
||||
const nsTArray<nsString>& aScriptURLs, WorkerScriptType aWorkerScriptType,
|
||||
ErrorResult& aRv)
|
||||
{
|
||||
@@ -2022,7 +2134,7 @@ Load(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
|
||||
loadInfos[index].mURL = aScriptURLs[index];
|
||||
}
|
||||
|
||||
LoadAllScripts(aCx, aWorkerPrivate, loadInfos, false, aWorkerScriptType, aRv);
|
||||
LoadAllScripts(aWorkerPrivate, loadInfos, false, aWorkerScriptType, aRv);
|
||||
}
|
||||
|
||||
} // namespace scriptloader
|
||||
|
||||
Reference in New Issue
Block a user