31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
|
From e5de31c8f927b1aa06dde02c356cda33beb463d9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kyle Huey <khuey@kylehuey.com>
|
||
|
|
Date: Fri, 19 Dec 2014 18:16:17 -0800
|
||
|
|
Subject: [PATCH] Bug 1111737. r=smaug, a=bkerensa
|
||
|
|
|
||
|
|
---
|
||
|
|
content/base/src/nsScriptLoader.cpp | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp
|
||
|
|
index a6a4c34..7f3a76e 100644
|
||
|
|
--- a/content/base/src/nsScriptLoader.cpp
|
||
|
|
+++ b/content/base/src/nsScriptLoader.cpp
|
||
|
|
@@ -812,7 +812,12 @@ NotifyOffThreadScriptLoadCompletedRunnable::Run()
|
||
|
|
{
|
||
|
|
MOZ_ASSERT(NS_IsMainThread());
|
||
|
|
|
||
|
|
- nsresult rv = mLoader->ProcessOffThreadRequest(mRequest, &mToken);
|
||
|
|
+ // We want these to be dropped on the main thread, once we return from this
|
||
|
|
+ // function.
|
||
|
|
+ nsRefPtr<nsScriptLoadRequest> request = mRequest.forget();
|
||
|
|
+ nsRefPtr<nsScriptLoader> loader = mLoader.forget();
|
||
|
|
+
|
||
|
|
+ nsresult rv = loader->ProcessOffThreadRequest(request, &mToken);
|
||
|
|
|
||
|
|
if (mToken) {
|
||
|
|
// The result of the off thread parse was not actually needed to process
|
||
|
|
--
|
||
|
|
2.1.2
|
||
|
|
|