Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/V8AbstractEventListener.cpp

Issue 2492793002: Support fetching attribute listeners from outside v8 context scopes. (Closed)
Patch Set: try to tidy up logic Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/core/v8/V8AbstractEventListener.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8AbstractEventListener.cpp b/third_party/WebKit/Source/bindings/core/v8/V8AbstractEventListener.cpp
index 8ed844641c38a7ce9e8a11ba829696a609b00ef0..1bc4613dc60fe0ef311672b031b0f748f11ac572 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8AbstractEventListener.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8AbstractEventListener.cpp
@@ -35,6 +35,8 @@
#include "bindings/core/v8/V8EventListenerHelper.h"
#include "bindings/core/v8/V8EventTarget.h"
#include "bindings/core/v8/V8HiddenValue.h"
+#include "core/dom/Document.h"
+#include "core/dom/DocumentParser.h"
#include "core/events/BeforeUnloadEvent.h"
#include "core/events/Event.h"
#include "core/workers/WorkerGlobalScope.h"
@@ -199,9 +201,19 @@ v8::Local<v8::Object> V8AbstractEventListener::getReceiverObject(
v8::Local<v8::Object>::Cast(value));
}
-bool V8AbstractEventListener::belongsToTheCurrentWorld() const {
- return ScriptState::hasCurrentScriptState(isolate()) &&
- &world() == &DOMWrapperWorld::current(isolate());
+bool V8AbstractEventListener::belongsToTheCurrentWorld(
+ ExecutionContext* executionContext) const {
+ if (ScriptState::hasCurrentScriptState(isolate()) &&
+ &world() == &DOMWrapperWorld::current(isolate()))
+ return true;
+ // If currently parsing, the parser could be accessing this listener
+ // outside of any v8 context; check if it belongs to the main world.
+ if (!isolate()->InContext() && executionContext->isDocument()) {
haraken 2016/11/11 03:54:40 Maybe the following looks a bit tidier? if (Scrip
sof 2016/11/11 06:27:04 If the current context is a debugger context, you
+ Document* document = toDocument(executionContext);
+ if (document->parser() && document->parser()->isParsing())
+ return world().isMainWorld();
+ }
+ return false;
}
void V8AbstractEventListener::clearListenerObject() {

Powered by Google App Engine
This is Rietveld 408576698