Revert 167276 "Remove isolatedWorldForEnteredContext() and isola..."

trunk/Source/bindings/scripts/code_generator_v8.pm

Index: trunk/Source/bindings/scripts/code_generator_v8.pm
===================================================================
--- trunk/Source/bindings/scripts/code_generator_v8.pm	(revision 167359)
+++ trunk/Source/bindings/scripts/code_generator_v8.pm	(working copy)
@@ -3109,7 +3109,7 @@
         #    and thus passing it around would cause leakage.
         # 2) Errors cannot be cloned (or serialized):
         # http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#safe-passing-of-structured-data
-        $implementation{nameSpaceInternal}->add("    if (DOMWrapperWorld::current(info.GetIsolate())->isIsolatedWorld()) {\n");
+        $implementation{nameSpaceInternal}->add("    if (isolatedWorldForIsolate(info.GetIsolate())) {\n");
         foreach my $attrName (@anyAttributeNames) {
             my $setter = "setSerialized" . FirstLetterToUpperCase($attrName);
             $implementation{nameSpaceInternal}->add(<<END);
@@ -5138,10 +5138,9 @@
         $code .= <<END;
     if (wrapper.IsEmpty())
         return wrapper;
-    DOMWrapperWorld* world = DOMWrapperWorld::current(isolate);
-    if (world->isMainWorld()) {
+    if (!isolatedWorldForEnteredContext(isolate)) {
         if (Frame* frame = impl->frame())
-            frame->script().windowShell(world)->updateDocumentWrapper(wrapper);
+            frame->script().windowShell(DOMWrapperWorld::mainWorld())->updateDocumentWrapper(wrapper);
     }
 END
     }