Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1364570 - Dispatch link prefetch events asynchronously to avoid DocGroup mismatches (r=bz)

Browse Source 
When we send out a prefetch request, we act as if the load came
from one of the possibly many documents containing <link> element
for the given URL. The docgroup assigned to this request is
derived from this document. Later, when the load finishes, the
OnStopRequest code runs in a runnable labeled with this
docgroup. OnStopRequest dispatches a load event to *all* the link
elements, including some that might be in different docgroups
from the OnStopRequest runnable. This generates an assertion.

To fix this, I decided to dispatch the load events
asynchronously. I'm hoping the extra round trip through the event
loop shouldn't hurt us too much since I doubt anyone actually
listens for these events.

MozReview-Commit-ID: FTkjuHO7RFp
This commit is contained in:
Bill McCloskey 2017-05-19 16:07:59 -07:00
parent c1a1aeca32
commit 79d1a76b44
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/events/AsyncEventDispatcher.cpp
View File

@ -39,6 +39,13 @@ AsyncEventDispatcher::Run()
if (mCanceled) {
return NS_OK;
}
if (mCheckStillInDoc) {
nsCOMPtr<nsINode> node = do_QueryInterface(mTarget);
MOZ_ASSERT(node);
if (!node->IsInComposedDoc()) {
return NS_OK;
}
}
mTarget->AsyncEventRunning(this);
RefPtr<Event> event = mEvent ? mEvent->InternalDOMEvent() : nullptr;
if (!event) {
@ -88,6 +95,15 @@ AsyncEventDispatcher::RunDOMEventWhenSafe()
nsContentUtils::AddScriptRunner(this);
}
void
AsyncEventDispatcher::RequireNodeInDocument()
{
nsCOMPtr<nsINode> node = do_QueryInterface(mTarget);
MOZ_ASSERT(node);
mCheckStillInDoc = true;
}
/******************************************************************************
* mozilla::LoadBlockingAsyncEventDispatcher
******************************************************************************/

6
dom/events/AsyncEventDispatcher.h
View File

@ -64,12 +64,18 @@ public:
nsresult PostDOMEvent();
void RunDOMEventWhenSafe();
// Calling this causes the Run() method to check that
// mTarget->IsInComposedDoc(). mTarget must be an nsINode or else we'll
// assert.
void RequireNodeInDocument();
nsCOMPtr<dom::EventTarget> mTarget;
nsCOMPtr<nsIDOMEvent> mEvent;
nsString mEventType;
bool mBubbles = false;
bool mOnlyChromeDispatch = false;
bool mCanceled = false;
bool mCheckStillInDoc = false;
};
class LoadBlockingAsyncEventDispatcher final : public AsyncEventDispatcher

29
uriloader/prefetch/nsPrefetchService.cpp
View File

@ -4,6 +4,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsPrefetchService.h"
#include "mozilla/AsyncEventDispatcher.h"
#include "mozilla/Attributes.h"
#include "mozilla/CORSMode.h"
#include "mozilla/dom/HTMLLinkElement.h"
#include "mozilla/Preferences.h"
#include "nsICacheEntry.h"
#include "nsIServiceManager.h"
#include "nsICategoryManager.h"
@ -25,10 +32,6 @@
#include "mozilla/Logging.h"
#include "plstr.h"
#include "nsIAsyncVerifyRedirectCallback.h"
#include "mozilla/Preferences.h"
#include "mozilla/Attributes.h"
#include "mozilla/CORSMode.h"
#include "mozilla/dom/HTMLLinkElement.h"
#include "nsIDOMNode.h"
#include "nsINode.h"
#include "nsIDocument.h"
@ -494,13 +497,17 @@ nsPrefetchService::DispatchEvent(nsPrefetchNode *node, bool aSuccess)
for (uint32_t i = 0; i < node->mSources.Length(); i++) {
nsCOMPtr<nsINode> domNode = do_QueryReferent(node->mSources.ElementAt(i));
if (domNode && domNode->IsInComposedDoc()) {
nsContentUtils::DispatchTrustedEvent(domNode->OwnerDoc(),
domNode,
aSuccess ?
NS_LITERAL_STRING("load") :
NS_LITERAL_STRING("error"),
/* aCanBubble = */ false,
/* aCancelable = */ false);
// We don't dispatch synchronously since |node| might be in a DocGroup
// that we're not allowed to touch. (Our network request happens in the
// DocGroup of one of the mSources nodes--not necessarily this one).
RefPtr<AsyncEventDispatcher> dispatcher =
new AsyncEventDispatcher(domNode,
aSuccess ?
NS_LITERAL_STRING("load") :
NS_LITERAL_STRING("error"),
/* aCanBubble = */ false);
dispatcher->RequireNodeInDocument();
dispatcher->PostDOMEvent();
}
}
}