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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 171313003: Revert 167360 "Revert 167276 "Remove isolatedWorldForEnteredCont..." (Closed) Base URL: svn://svn.chromium.org/blink/
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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/Source/bindings/tests/results/V8TestInterfaceEventConstructor.cpp ('k') | trunk/Source/bindings/v8/ScriptController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/bindings/v8/DOMWrapperWorld.cpp
===================================================================
--- trunk/Source/bindings/v8/DOMWrapperWorld.cpp (revision 167360)
+++ trunk/Source/bindings/v8/DOMWrapperWorld.cpp (working copy)
@@ -62,14 +62,10 @@
DOMWrapperWorld* DOMWrapperWorld::current(v8::Isolate* isolate)
{
- ASSERT(isolate->InContext());
v8::Handle<v8::Context> context = isolate->GetCurrentContext();
- if (!toDOMWindow(context))
+ if (context.IsEmpty() || !toDOMWindow(context))
return 0;
- ASSERT(isMainThread());
- if (DOMWrapperWorld* world = isolatedWorld(context))
- return world;
- return mainWorld();
+ return world(context);
}
DOMWrapperWorld* DOMWrapperWorld::mainWorld()
« no previous file with comments | « trunk/Source/bindings/tests/results/V8TestInterfaceEventConstructor.cpp ('k') | trunk/Source/bindings/v8/ScriptController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698