Remove isolatedWorldForEnteredContext() and isolatedWorldForIsolate()

Remove isolatedWorldForEnteredContext() and isolatedWorldForIsolate()

- isolatedWorldForIsolate() is equivalent to DOMWrapperWorld::current()->isIsolatedWorld().

- isolatedWorldForEnteredContext() is equivalent to DOMWrapperWorld::current()->isIsolatedWorld().
Remember that the world of the current context is equal to the world of the entered context.

Thus this CL replaces these methods with DOMWrapperWorld::current()->isIsolatedWorld().

BUG=341032
R=dcarney@chromium.org, eseidel@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=167276

[haraken, 2014-02-05 11:45:46]

PTAL

[dcarney, 2014-02-05 15:24:52]

lgtm

[haraken, 2014-02-05 15:27:17]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-05 15:27:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/40001

[haraken, 2014-02-05 15:27:24]

On 2014/02/05 15:24:52, dcarney wrote:
> lgtm

Thanks for review!

[commit-bot: I haz the power, 2014-02-05 16:07:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-05 16:07:50]

Retried try job too often on mac_layout for step(s) webkit_lint
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_layout...

[haraken, 2014-02-07 00:36:36]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-07 00:36:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/40001

[commit-bot: I haz the power, 2014-02-07 00:36:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-07 00:36:49]

Failed to apply patch for Source/bindings/scripts/code_generator_v8.pm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/bindings/scripts/code_generator_v8.pm
  Hunk #1 succeeded at 3098 (offset 8 lines).
  Hunk #2 FAILED at 5126.
  1 out of 2 hunks FAILED -- saving rejects to file
Source/bindings/scripts/code_generator_v8.pm.rej

Patch:       Source/bindings/scripts/code_generator_v8.pm
Index: Source/bindings/scripts/code_generator_v8.pm
diff --git a/Source/bindings/scripts/code_generator_v8.pm
b/Source/bindings/scripts/code_generator_v8.pm
index
09cb052c8b7945fa334d7648342d50249b1513c7..70f95e0d55c8c7b20e40ae334c94decec723917e
100644
--- a/Source/bindings/scripts/code_generator_v8.pm
+++ b/Source/bindings/scripts/code_generator_v8.pm
@@ -3090,7 +3090,7 @@ END
         #    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-interf...
-        $implementation{nameSpaceInternal}->add("    if
(isolatedWorldForIsolate(info.GetIsolate())) {\n");
+        $implementation{nameSpaceInternal}->add("    if
(DOMWrapperWorld::current(info.GetIsolate())->isIsolatedWorld()) {\n");
         foreach my $attrName (@anyAttributeNames) {
             my $setter = "setSerialized" . FirstLetterToUpperCase($attrName);
             $implementation{nameSpaceInternal}->add(<<END);
@@ -5126,9 +5126,10 @@ END
         $code .= <<END;
     if (wrapper.IsEmpty())
         return wrapper;
-    if (!isolatedWorldForEnteredContext(isolate)) {
+    DOMWrapperWorld* world = DOMWrapperWorld::current(isolate);
+    if (world->isMainWorld()) {
         if (Frame* frame = impl->frame())
-           
frame->script().windowShell(mainThreadNormalWorld())->updateDocumentWrapper(wrapper);
+            frame->script().windowShell(world)->updateDocumentWrapper(wrapper);
     }
 END
     }

[haraken, 2014-02-07 00:42:26]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-07 00:42:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/310001

[commit-bot: I haz the power, 2014-02-07 01:28:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-07 01:28:24]

Retried try job too often on mac_blink_rel for step(s) blink_heap_unittests,
blink_platform_unittests, webkit_lint, webkit_python_tests, webkit_tests,
webkit_unit_tests, wtf_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_blink_...

[haraken, 2014-02-12 12:07:43]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-12 12:07:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/500001

[commit-bot: I haz the power, 2014-02-12 12:08:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-12 12:08:03]

Failed to apply patch for Source/bindings/scripts/code_generator_v8.pm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/bindings/scripts/code_generator_v8.pm
  Hunk #1 FAILED at 1782.
  Hunk #2 FAILED at 2134.
  Hunk #3 FAILED at 2150.
  Hunk #4 succeeded at 3102 (offset 2 lines).
  Hunk #5 succeeded at 5131 (offset 5 lines).
  3 out of 5 hunks FAILED -- saving rejects to file
Source/bindings/scripts/code_generator_v8.pm.rej

Patch:       Source/bindings/scripts/code_generator_v8.pm
Index: Source/bindings/scripts/code_generator_v8.pm
diff --git a/Source/bindings/scripts/code_generator_v8.pm
b/Source/bindings/scripts/code_generator_v8.pm
index
1207addbfb84546e62149957d31408972b2356ce..e4f75fb2a7dc6e752ad8beb9a57e6943800010cc
100644
--- a/Source/bindings/scripts/code_generator_v8.pm
+++ b/Source/bindings/scripts/code_generator_v8.pm
@@ -1782,7 +1782,6 @@ END
         } else {
             $functionName = "imp->${functionName}";
         }
-        push(@arguments, "isolatedWorldForIsolate(info.GetIsolate())");
         $code .= "    EventListener* jsValue = ${functionName}(" . join(", ",
@arguments) . ");\n";
         $code .= "    v8SetReturnValue(info, jsValue ?
v8::Handle<v8::Value>(V8AbstractEventListener::cast(jsValue)->getListenerObject(imp->executionContext()))
: v8::Handle<v8::Value>(v8::Null(info.GetIsolate())));\n";
     } else {
@@ -2134,7 +2133,6 @@ END
             } else {
                 $attrImplName = "imp->${attrImplName}";
             }
-            push(@arguments, "isolatedWorldForIsolate(info.GetIsolate())");
             $code .= "    moveEventListenerToNewWrapper(info.Holder(),
${attrImplName}(" . join(", ", @arguments) . "), jsValue,
${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
         }
         my ($functionName, @arguments) = SetterExpression($interfaceName,
$attribute);
@@ -2150,7 +2148,6 @@ END
         } else {
             push(@arguments, "V8EventListenerList::getEventListener(jsValue,
true, ListenerFindOrCreate)");
         }
-        push(@arguments, "isolatedWorldForIsolate(info.GetIsolate())");
         $code .= "    ${functionName}(" . join(", ", @arguments) . ");\n";
     } else {
         my ($functionName, @arguments) = SetterExpression($interfaceName,
$attribute);
@@ -3100,7 +3097,7 @@ END
         #    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-interf...
-        $implementation{nameSpaceInternal}->add("    if
(isolatedWorldForIsolate(info.GetIsolate())) {\n");
+        $implementation{nameSpaceInternal}->add("    if
(DOMWrapperWorld::current(info.GetIsolate())->isIsolatedWorld()) {\n");
         foreach my $attrName (@anyAttributeNames) {
             my $setter = "setSerialized" . FirstLetterToUpperCase($attrName);
             $implementation{nameSpaceInternal}->add(<<END);
@@ -5126,9 +5123,10 @@ END
         $code .= <<END;
     if (wrapper.IsEmpty())
         return wrapper;
-    if (!isolatedWorldForEnteredContext(isolate)) {
+    DOMWrapperWorld* world = DOMWrapperWorld::current(isolate);
+    if (world->isMainWorld()) {
         if (Frame* frame = impl->frame())
-           
frame->script().windowShell(DOMWrapperWorld::mainWorld())->updateDocumentWrapper(wrapper);
+            frame->script().windowShell(world)->updateDocumentWrapper(wrapper);
     }
 END
     }

[haraken, 2014-02-12 12:12:46]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-12 12:12:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/570001

[commit-bot: I haz the power, 2014-02-12 12:55:46]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-12 12:55:47]

Retried try job too often on mac_blink_rel for step(s) webkit_unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_blink_...

[haraken, 2014-02-14 03:43:53]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-14 03:44:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/740001

[eseidel, 2014-02-14 04:16:12]

Curious the context here?  Just code cleanup? or is this part of a larger
direction?

(rslgtm, so my comment doesn't cause your CQ to fail.)

[haraken, 2014-02-14 04:38:09]

On 2014/02/14 04:16:12, eseidel wrote:
> Curious the context here?  Just code cleanup? or is this part of a larger
> direction?
> 
> (rslgtm, so my comment doesn't cause your CQ to fail.)

sorry, the context is bug 341032. I added it to the CL description.

I'm cleaning up the code around isolated worlds in preparation to harden the
security of isolated worlds.

[eseidel, 2014-02-14 04:53:23]

The CQ bit was unchecked by eseidel@chromium.org

[eseidel, 2014-02-14 04:53:24]

The CQ bit was checked by eseidel@chromium.org

[eseidel, 2014-02-14 04:53:24]

The CQ bit was unchecked by eseidel@chromium.org

[eseidel, 2014-02-14 04:53:25]

The CQ bit was checked by eseidel@chromium.org

[eseidel, 2014-02-14 04:53:49]

Thanks!  (I checked and unchecked the CQ so it won't barf due to a changed
description.)

[commit-bot: I haz the power, 2014-02-14 05:42:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-14 05:42:19]

Retried try job too often on linux_blink_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...

[haraken, 2014-02-14 06:28:26]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-14 06:28:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/960001

[haraken, 2014-02-14 06:50:45]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-14 06:51:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/1100001

[commit-bot: I haz the power, 2014-02-14 07:45:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-14 07:45:17]

Retried try job too often on linux_blink_rel for step(s) blink_heap_unittests,
blink_platform_unittests, webkit_lint, webkit_python_tests, webkit_tests,
webkit_unit_tests, wtf_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...

[haraken, 2014-02-14 08:05:13]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-14 08:05:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/790002

[commit-bot: I haz the power, 2014-02-14 10:26:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-14 10:26:32]

Retried try job too often on linux_blink for step(s) webkit_unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...

[haraken, 2014-02-17 01:11:23]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-17 01:11:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/1340001

[commit-bot: I haz the power, 2014-02-17 01:55:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-17 01:55:25]

Retried try job too often on mac_blink_rel for step(s) webkit_unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_blink_...

[haraken, 2014-02-17 02:11:23]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-17 02:11:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/1520001

[commit-bot: I haz the power, 2014-02-17 02:47:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-17 02:47:38]

Retried try job too often on mac_blink_rel for step(s) webkit_unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_blink_...

[haraken, 2014-02-17 03:09:38]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-17 03:09:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/1670001

[haraken, 2014-02-17 03:13:59]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-17 03:14:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/1700001

[commit-bot: I haz the power, 2014-02-17 06:12:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-17 06:12:59]

Retried try job too often on linux_blink for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...

[haraken, 2014-02-17 07:36:51]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-02-17 07:37:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/haraken@chromium.org/137953010/1700001

[haraken, 2014-02-17 11:38:37]

Committed patchset #16 manually as r167276 (presubmit successful).