Source/bindings/v8/DOMWrapperWorld.cpp - Issue 137953010: Remove isolatedWorldForEnteredContext() and isolatedWorldForIsolate()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/bindings/v8/DOMWrapperWorld.cpp

Issue 137953010: Remove isolatedWorldForEnteredContext() and isolatedWorldForIsolate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/bindings/v8/DOMWrapperWorld.cpp

diff --git a/Source/bindings/v8/DOMWrapperWorld.cpp b/Source/bindings/v8/DOMWrapperWorld.cpp

index 6b130ae9722e8ba8c779e2ce62132dc36a30fad9..250c3f1a979ccf0288b0b75265f771b07fa01900 100644

--- a/Source/bindings/v8/DOMWrapperWorld.cpp

+++ b/Source/bindings/v8/DOMWrapperWorld.cpp

@@ -67,11 +67,9 @@ DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup)

DOMWrapperWorld* DOMWrapperWorld::current(v8::Isolate* isolate)

{

- ASSERT(isolate->InContext());

v8::Handle<v8::Context> context = isolate->GetCurrentContext();

- if (!toDOMWindow(context))

+ if (context.IsEmpty() || !contextHasCorrectPrototype(context))

return 0;

- ASSERT(isMainThread());

if (DOMWrapperWorld* world = isolatedWorld(context))

return world;

return mainWorld();