Remove world type from hasInstance()

Remove world type from hasInstance()

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

[haraken, 2014-01-07 06:13:59]

This CL is still WIP. Not yet for review.

Currently we're using two DOM template maps; one for the main world and the
other for other worlds (i.e., worker worlds and isolated worlds). Remember that
this DOM template map is not per-world. In terms of correctness, I don't see any
reason why we have to separate DOM template maps between the main world and
other worlds.

Because we have two DOM template maps, we have to look up worldType(isolate) in
a lot of performance-sensitive places. This CL tries to remove the separation.

[marja, 2014-01-07 09:14:15]

Is the idea to remove the V8PerWorldBindings feature completely or partially or
leave it unaffected? I don't understand what you're saying ("we're using two DOM
template maps; one for the main world and the other for other worlds" -- "this
(<<which??) DOM template map is not per-world").

[haraken, 2014-01-07 09:23:34]

On 2014/01/07 09:14:15, marja wrote:
> Is the idea to remove the V8PerWorldBindings feature completely or partially
or
> leave it unaffected? I don't understand what you're saying ("we're using two
DOM
> template maps; one for the main world and the other for other worlds" -- "this
> (<<which??) DOM template map is not per-world").

I'm just trying to use only one DOM template map shared among all worlds.

Before (we have two DOM template maps):
- One DOM template map for the main world
- One DOM template map shared among worker worlds and isolated worlds

After (we have only one DOM template map):
- One DOM template map shared among the main world, worker worlds and isolated
worlds

[haraken, 2014-01-07 09:25:38]

On 2014/01/07 09:23:34, haraken wrote:
> On 2014/01/07 09:14:15, marja wrote:
> > Is the idea to remove the V8PerWorldBindings feature completely or partially
> or
> > leave it unaffected?

Ah, sorry, understood. I was doing something stupid. You're completely right.

We have two separate template maps for PerWorldBindings.

Please ignore this CL :)

[haraken, 2014-01-07 09:27:10]

On 2014/01/07 09:25:38, haraken wrote:
> On 2014/01/07 09:23:34, haraken wrote:
> > On 2014/01/07 09:14:15, marja wrote:
> > > Is the idea to remove the V8PerWorldBindings feature completely or
partially
> > or
> > > leave it unaffected?
> 
> Ah, sorry, understood. I was doing something stupid. You're completely right.
> 
> We have two separate template maps for PerWorldBindings.
> 
> Please ignore this CL :)

The background of this stupid work is:

- I found that hasInstance() is called in a lot of performance-sensitive places
- hasInstance() calls worldType(), and worldType() is heavy
- So I wanted to remove worldType() from hasInstance()

[commit-bot: I haz the power, 2014-01-07 09:58:43]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a lowly provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[haraken, 2014-01-14 09:36:34]

marja:

Does it make sense to deprecate hasInstance(wrapper, isolate,
worldType(isolate)) and replace it with hasInstanceInAnyWorld(wrapper, isolate)?

- hasInstanceInAnyWorld(wrapper, isolate) checks function templates in two
worlds (the function template for the main world and then the function template
for other worlds).

- On the other hand, hasInstance(wrapper, isolate, worldType(isolate)) looks up
the current world and then checks the function template of the current world.

- The overhead of looking up the current world is heavier than the overhead of
checking two function templates. Also, since most wrappers are in the main
world, we will need to check only one function template in most cases.

- Thus, hasInstanceInAnyWorld(wrapper, isolate) will be faster than
hasInstance(wrapper, isolate, worldType(isolate)).

- In addition, if we deprecate hasInstance(wrapper, isolate,
worldType(isolate)), we can remove worldType(info.GetIsolate()) in a ton of
places.

WDYT?

[marja, 2014-01-15 08:06:29]

Hmm, so the assumption would be that when we ask
"hasInstanceInAnyWorld(wrapperTypeInfo, v8::Value)", which boils down to
HasInstance(functionTemplate for some world, v8::Value), we don't get a "yes"
from a wrong world, that is, only get "yes" from the right world.

If that is true, we can just check function templates for all worlds, and if the
v8::Value is an instance of some of them, then "yes", otherwise "no".

So what you say sounds reasonable to me, and it looks like we could replace
hasInstance with hasInstanceInAnyWorld.

[haraken, 2014-01-17 05:55:41]

On 2014/01/15 08:06:29, marja wrote:
> Hmm, so the assumption would be that when we ask
> "hasInstanceInAnyWorld(wrapperTypeInfo, v8::Value)", which boils down to
> HasInstance(functionTemplate for some world, v8::Value), we don't get a "yes"
> from a wrong world, that is, only get "yes" from the right world.
> 
> If that is true, we can just check function templates for all worlds, and if
the
> v8::Value is an instance of some of them, then "yes", otherwise "no".
> 
> So what you say sounds reasonable to me, and it looks like we could replace
> hasInstance with hasInstanceInAnyWorld.

Thanks marja. I update the CL. PTAL.

Would you take a look at code_generator_v8.pm and V8PerIsolateData.{h,cpp}?
Other changes are just mechanical ones.

[marja, 2014-01-17 08:10:09]

lgtm

[commit-bot: I haz the power, 2014-01-17 08:45:48]

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

[commit-bot: I haz the power, 2014-01-17 09:18:47]

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

[commit-bot: I haz the power, 2014-01-17 09:47:48]

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

[commit-bot: I haz the power, 2014-01-17 10:15:48]

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

[haraken, 2014-01-17 12:24:03]

Looks like the failures of try bots are not related to this change.

@abarth: Would you take a look at web/ ?

[abarth-chromium, 2014-01-18 08:43:49]

lgtm

[commit-bot: I haz the power, 2014-01-18 08:43:57]

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

[commit-bot: I haz the power, 2014-01-18 08:44:21]

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 743 (offset 1 line).
  Hunk #2 succeeded at 1971 (offset 1 line).
  Hunk #3 succeeded at 2206 (offset 1 line).
  Hunk #4 succeeded at 2724 (offset 1 line).
  Hunk #5 FAILED at 2777.
  Hunk #6 succeeded at 4765 (offset 2 lines).
  Hunk #7 succeeded at 5615 (offset 2 lines).
  1 out of 7 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
d0e432ec7f81e3f741c9e4cbb065247bbfd9e98a..67c73ef72cb2636cc65d7b7fa01ae495207fecb2
100644
--- a/Source/bindings/scripts/code_generator_v8.pm
+++ b/Source/bindings/scripts/code_generator_v8.pm
@@ -742,8 +742,7 @@ END
     $header{class}->addFooter("};");
 
     $header{classPublic}->add(<<END);
-    static bool hasInstance(v8::Handle<v8::Value>, v8::Isolate*,
WrapperWorldType);
-    static bool hasInstanceInAnyWorld(v8::Handle<v8::Value>, v8::Isolate*);
+    static bool hasInstance(v8::Handle<v8::Value>, v8::Isolate*);
     static v8::Handle<v8::FunctionTemplate> domTemplate(v8::Isolate*,
WrapperWorldType);
     static ${nativeType}* toNative(v8::Handle<v8::Object> object)
     {
@@ -1971,7 +1970,7 @@ sub GenerateNormalAttributeSetter
     # be converted to both strings and numbers, so do not throw TypeError if
the
     # attribute is of these types.
     if ($hasStrictTypeChecking) {
-        $code .= "    if (!isUndefinedOrNull(jsValue) &&
!V8${attrType}::hasInstance(jsValue, info.GetIsolate(),
worldType(info.GetIsolate()))) {\n";
+        $code .= "    if (!isUndefinedOrNull(jsValue) &&
!V8${attrType}::hasInstance(jsValue, info.GetIsolate())) {\n";
         $code .= "        exceptionState.throwTypeError(\"The provided value is
not of type '${attrType}'.\");\n";
         $code .= "        exceptionState.throwIfNeeded();\n";
         $code .= "        return;\n";
@@ -2206,9 +2205,9 @@ sub GenerateParametersCheckExpression
             }
         } elsif (IsWrapperType($type)) {
             if ($parameter->isNullable) {
-                push(@andExpression, "${value}->IsNull() ||
V8${type}::hasInstance($value, info.GetIsolate(),
worldType(info.GetIsolate()))");
+                push(@andExpression, "${value}->IsNull() ||
V8${type}::hasInstance($value, info.GetIsolate())");
             } else {
-                push(@andExpression, "V8${type}::hasInstance($value,
info.GetIsolate(), worldType(info.GetIsolate()))");
+                push(@andExpression, "V8${type}::hasInstance($value,
info.GetIsolate())");
             }
         }
 
@@ -2724,7 +2723,7 @@ END
             if (IsWrapperType($argType)) {
                 $parameterCheckString .= "    Vector<$nativeElementType>
$parameterName;\n";
                 $parameterCheckString .= "    for (int i = $paramIndex; i <
info.Length(); ++i) {\n";
-                $parameterCheckString .= "        if
(!V8${argType}::hasInstance(info[i], info.GetIsolate(),
worldType(info.GetIsolate()))) {\n";
+                $parameterCheckString .= "        if
(!V8${argType}::hasInstance(info[i], info.GetIsolate())) {\n";
                 if ($hasExceptionState) {
                     $parameterCheckString .= "           
exceptionState.throwTypeError(\"parameter $humanFriendlyIndex is not of type
\'$argType\'.\");\n";
                     $parameterCheckString .= "           
exceptionState.throwIfNeeded();\n";
@@ -2778,7 +2777,7 @@ END
                 my $argValue = "info[$paramIndex]";
                 my $argType = $parameter->type;
                 if (IsWrapperType($argType)) {
-                    $parameterCheckString .= "    if (info.Length() >
$paramIndex && !isUndefinedOrNull($argValue) &&
!V8${argType}::hasInstance($argValue, info.GetIsolate(),
worldType(info.GetIsolate()))) {\n";
+                    $parameterCheckString .= "    if (info.Length() >
$paramIndex && !isUndefinedOrNull($argValue) &&
!V8${argType}::hasInstance($argValue, info.GetIsolate())) {\n";
                     if ($hasExceptionState) {
                         $parameterCheckString .= "       
exceptionState.throwTypeError(\"parameter $humanFriendlyIndex is not of type
\'$argType\'.\");\n";
                         $parameterCheckString .= "       
exceptionState.throwIfNeeded();\n";
@@ -4764,20 +4763,10 @@ v8::Handle<v8::FunctionTemplate>
${v8ClassName}::domTemplate(v8::Isolate* isolat
     return handleScope.Escape(templ);
 }
 
-END
-    $implementation{nameSpaceWebCore}->add(<<END);
-bool ${v8ClassName}::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate*
isolate, WrapperWorldType currentWorldType)
-{
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, currentWorldType);
-}
-
-END
-    $implementation{nameSpaceWebCore}->add(<<END);
-bool ${v8ClassName}::hasInstanceInAnyWorld(v8::Handle<v8::Value> jsValue,
v8::Isolate* isolate)
+bool ${v8ClassName}::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate*
isolate)
 {
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, MainWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, IsolatedWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, WorkerWorld);
+    return
V8PerIsolateData::from(isolate)->hasInstanceInMainWorld(&wrapperTypeInfo,
jsValue)
+        ||
V8PerIsolateData::from(isolate)->hasInstanceInNonMainWorld(&wrapperTypeInfo,
jsValue);
 }
 
 END
@@ -5624,7 +5613,7 @@ sub JSValueToNative
     AddIncludesForType($type);
 
     AddToImplIncludes("V8${type}.h");
-    return "V8${type}::hasInstance($value, $getIsolate, worldType($getIsolate))
? V8${type}::toNative(v8::Handle<v8::Object>::Cast($value)) : 0";
+    return "V8${type}::hasInstance($value, $getIsolate) ?
V8${type}::toNative(v8::Handle<v8::Object>::Cast($value)) : 0";
 }
 
 sub IsUnionType

[commit-bot: I haz the power, 2014-01-20 01:05:28]

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

[commit-bot: I haz the power, 2014-01-20 01:37:03]

Retried try job too often on linux_blink for step(s) 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...

[commit-bot: I haz the power, 2014-01-20 01:40:16]

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

[commit-bot: I haz the power, 2014-01-20 02:13:28]

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...

[commit-bot: I haz the power, 2014-01-20 03:31:37]

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

[commit-bot: I haz the power, 2014-01-20 03:55:44]

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

[commit-bot: I haz the power, 2014-01-20 04:51:28]

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

[commit-bot: I haz the power, 2014-01-20 04:51:50]

Failed to apply patch for Source/bindings/tests/results/V8TestInterface.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/bindings/tests/results/V8TestInterface.cpp
  Hunk #1 FAILED at 187.
  Hunk #2 FAILED at 242.
  Hunk #3 FAILED at 269.
  Hunk #4 succeeded at 362 (offset -40 lines).
  Hunk #5 succeeded at 397 (offset -40 lines).
  Hunk #6 succeeded at 432 (offset -40 lines).
  Hunk #7 succeeded at 467 (offset -40 lines).
  Hunk #8 succeeded at 852 (offset -46 lines).
  3 out of 8 hunks FAILED -- saving rejects to file
Source/bindings/tests/results/V8TestInterface.cpp.rej

Patch:       Source/bindings/tests/results/V8TestInterface.cpp
Index: Source/bindings/tests/results/V8TestInterface.cpp
diff --git a/Source/bindings/tests/results/V8TestInterface.cpp
b/Source/bindings/tests/results/V8TestInterface.cpp
index
ff1795996fafcef3cc327e9e67d01aa0f0ea1835..65e9853a1852ab4f9af9a752ee02573a0d60397f
100644
--- a/Source/bindings/tests/results/V8TestInterface.cpp
+++ b/Source/bindings/tests/results/V8TestInterface.cpp
@@ -187,7 +187,7 @@ static void
implementsNodeAttributeGetterCallback(v8::Local<v8::String>, const v
 static void implementsNodeAttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     TestImplements::setImplementsNode(imp, WTF::getPtr(cppValue));
 }
 
@@ -242,7 +242,7 @@ static void
Node23AttributeGetterCallback(v8::Local<v8::String>, const v8::Prope
 static void Node23AttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     TestImplements::setNode23(imp, WTF::getPtr(cppValue));
 }
 
@@ -269,7 +269,7 @@ static void
Node24AttributeGetterCallback(v8::Local<v8::String>, const v8::Prope
 static void Node24AttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     TestImplements::setNode24(imp, WTF::getPtr(cppValue));
 }
 
@@ -402,7 +402,7 @@ static void
supplementalNodeAttributeGetterCallback(v8::Local<v8::String>, const
 static void supplementalNodeAttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     TestPartialInterface::setSupplementalNode(imp, WTF::getPtr(cppValue));
 }
 #endif // ENABLE(CONDITION_PARTIAL)
@@ -437,7 +437,7 @@ static void
Node13AttributeGetterCallback(v8::Local<v8::String>, const v8::Prope
 static void Node13AttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     TestPartialInterface::setNode13(imp, WTF::getPtr(cppValue));
 }
 #endif // ENABLE(CONDITION_PARTIAL)
@@ -472,7 +472,7 @@ static void
Node14AttributeGetterCallback(v8::Local<v8::String>, const v8::Prope
 static void Node14AttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     TestPartialInterface::setNode14(imp, WTF::getPtr(cppValue));
 }
 #endif // ENABLE(CONDITION_PARTIAL)
@@ -507,7 +507,7 @@ static void
Node15AttributeGetterCallback(v8::Local<v8::String>, const v8::Prope
 static void Node15AttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     TestPartialInterface::setNode15(imp, WTF::getPtr(cppValue));
 }
 #endif // ENABLE(CONDITION_PARTIAL)
@@ -898,16 +898,10 @@ v8::Handle<v8::FunctionTemplate>
V8TestInterface::domTemplate(v8::Isolate* isola
     return handleScope.Escape(templ);
 }
 
-bool V8TestInterface::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate*
isolate, WrapperWorldType currentWorldType)
+bool V8TestInterface::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate*
isolate)
 {
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, currentWorldType);
-}
-
-bool V8TestInterface::hasInstanceInAnyWorld(v8::Handle<v8::Value> jsValue,
v8::Isolate* isolate)
-{
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, MainWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, IsolatedWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, WorkerWorld);
+    return
V8PerIsolateData::from(isolate)->hasInstanceInMainWorld(&wrapperTypeInfo,
jsValue)
+        ||
V8PerIsolateData::from(isolate)->hasInstanceInNonMainWorld(&wrapperTypeInfo,
jsValue);
 }
 
 void V8TestInterface::installPerContextEnabledProperties(v8::Handle<v8::Object>
instanceTemplate, TestInterface* impl, v8::Isolate* isolate)

[commit-bot: I haz the power, 2014-01-23 09:15:16]

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

[commit-bot: I haz the power, 2014-01-23 09:15:40]

Failed to apply patch for
Source/bindings/tests/results/V8SupportTestInterface.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: Source/bindings/tests/results/V8SupportTestInterface.cpp
  |diff --git a/Source/bindings/tests/results/V8SupportTestInterface.cpp
b/Source/bindings/tests/results/V8SupportTestInterface.cpp
  |index
6d03794e32c556f50c1191b7893c516e55abd9e2..815f05b7a3881980597ec867cc47efa4646b4af1
100644
  |--- a/Source/bindings/tests/results/V8SupportTestInterface.cpp
  |+++ b/Source/bindings/tests/results/V8SupportTestInterface.cpp
  --------------------------
  No file to patch.  Skipping patch.
  5 out of 5 hunks ignored

Patch:       Source/bindings/tests/results/V8SupportTestInterface.cpp
Index: Source/bindings/tests/results/V8SupportTestInterface.cpp
diff --git a/Source/bindings/tests/results/V8SupportTestInterface.cpp
b/Source/bindings/tests/results/V8SupportTestInterface.cpp
index
6d03794e32c556f50c1191b7893c516e55abd9e2..815f05b7a3881980597ec867cc47efa4646b4af1
100644
--- a/Source/bindings/tests/results/V8SupportTestInterface.cpp
+++ b/Source/bindings/tests/results/V8SupportTestInterface.cpp
@@ -214,7 +214,7 @@ static void
supplementalNodeAttributeGetterCallback(v8::Local<v8::String>, const
 static void supplementalNodeAttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     SupportTestInterface* imp =
V8SupportTestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     SupportTestPartialInterface::setSupplementalNode(imp,
WTF::getPtr(cppValue));
 }
 #endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -249,7 +249,7 @@ static void
Node13AttributeGetterCallback(v8::Local<v8::String>, const v8::Prope
 static void Node13AttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     SupportTestInterface* imp =
V8SupportTestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     SupportTestPartialInterface::setNode13(imp, WTF::getPtr(cppValue));
 }
 #endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -284,7 +284,7 @@ static void
Node14AttributeGetterCallback(v8::Local<v8::String>, const v8::Prope
 static void Node14AttributeSetter(v8::Local<v8::Value> jsValue, const
v8::PropertyCallbackInfo<void>& info)
 {
     SupportTestInterface* imp =
V8SupportTestInterface::toNative(info.Holder());
-    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) : 0);
+    V8TRYCATCH_VOID(Node*, cppValue, V8Node::hasInstance(jsValue,
info.GetIsolate()) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(jsValue)) :
0);
     SupportTestPartialInterface::setNode14(imp, WTF::getPtr(cppValue));
 }
 #endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -326,7 +326,7 @@ static void supplementalMethod2Method(const
v8::FunctionCallbackInfo<v8::Value>&
     }
     SupportTestInterface* imp =
V8SupportTestInterface::toNative(info.Holder());
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, strArg, info[0]);
-    V8TRYCATCH_VOID(TestObj*, objArg, V8TestObject::hasInstance(info[1],
info.GetIsolate(), worldType(info.GetIsolate())) ?
V8TestObject::toNative(v8::Handle<v8::Object>::Cast(info[1])) : 0);
+    V8TRYCATCH_VOID(TestObj*, objArg, V8TestObject::hasInstance(info[1],
info.GetIsolate()) ?
V8TestObject::toNative(v8::Handle<v8::Object>::Cast(info[1])) : 0);
     ExecutionContext* scriptContext = getExecutionContext();
     RefPtr<TestObj> result =
SupportTestPartialInterface::supplementalMethod2(scriptContext, imp, strArg,
objArg, exceptionState);
     if (exceptionState.throwIfNeeded())
@@ -453,16 +453,10 @@ v8::Handle<v8::FunctionTemplate>
V8SupportTestInterface::domTemplate(v8::Isolate
     return handleScope.Escape(templ);
 }
 
-bool V8SupportTestInterface::hasInstance(v8::Handle<v8::Value> jsValue,
v8::Isolate* isolate, WrapperWorldType currentWorldType)
+bool V8SupportTestInterface::hasInstance(v8::Handle<v8::Value> jsValue,
v8::Isolate* isolate)
 {
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, currentWorldType);
-}
-
-bool V8SupportTestInterface::hasInstanceInAnyWorld(v8::Handle<v8::Value>
jsValue, v8::Isolate* isolate)
-{
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, MainWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, IsolatedWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, WorkerWorld);
+    return
V8PerIsolateData::from(isolate)->hasInstanceInMainWorld(&wrapperTypeInfo,
jsValue)
+        ||
V8PerIsolateData::from(isolate)->hasInstanceInNonMainWorld(&wrapperTypeInfo,
jsValue);
 }
 
 void
V8SupportTestInterface::installPerContextEnabledProperties(v8::Handle<v8::Object>
instanceTemplate, SupportTestInterface* impl, v8::Isolate* isolate)

[commit-bot: I haz the power, 2014-01-23 09:25:45]

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

[commit-bot: I haz the power, 2014-01-23 09:26:15]

Failed to apply patch for
Source/bindings/tests/results/V8TestInterfaceConstructor.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/bindings/tests/results/V8TestInterfaceConstructor.cpp
  Hunk #3 FAILED at 123.
  1 out of 4 hunks FAILED -- saving rejects to file
Source/bindings/tests/results/V8TestInterfaceConstructor.cpp.rej

Patch:       Source/bindings/tests/results/V8TestInterfaceConstructor.cpp
Index: Source/bindings/tests/results/V8TestInterfaceConstructor.cpp
diff --git a/Source/bindings/tests/results/V8TestInterfaceConstructor.cpp
b/Source/bindings/tests/results/V8TestInterfaceConstructor.cpp
index
8543667fa1cca53e3849c0556648418152eb742c..5c4ef0e2a8b8f70058a509a2a270beea60556a11
100644
--- a/Source/bindings/tests/results/V8TestInterfaceConstructor.cpp
+++ b/Source/bindings/tests/results/V8TestInterfaceConstructor.cpp
@@ -91,7 +91,7 @@ static void constructor2(const
v8::FunctionCallbackInfo<v8::Value>& info)
     ExceptionState exceptionState(ExceptionState::ConstructionContext,
"TestInterfaceConstructor", info.Holder(), info.GetIsolate());
     V8TRYCATCH_VOID(double, doubleArg,
static_cast<double>(info[0]->NumberValue()));
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, stringArg,
info[1]);
-    V8TRYCATCH_VOID(TestInterfaceEmpty*, testInterfaceEmptyArg,
V8TestInterfaceEmpty::hasInstance(info[2], info.GetIsolate(),
worldType(info.GetIsolate())) ?
V8TestInterfaceEmpty::toNative(v8::Handle<v8::Object>::Cast(info[2])) : 0);
+    V8TRYCATCH_VOID(TestInterfaceEmpty*, testInterfaceEmptyArg,
V8TestInterfaceEmpty::hasInstance(info[2], info.GetIsolate()) ?
V8TestInterfaceEmpty::toNative(v8::Handle<v8::Object>::Cast(info[2])) : 0);
     V8TRYCATCH_VOID(Dictionary, dictionaryArg, Dictionary(info[3],
info.GetIsolate()));
     if (!dictionaryArg.isUndefinedOrNull() && !dictionaryArg.isObject()) {
         exceptionState.throwTypeError("parameter 4 ('dictionaryArg') is not an
object.");
@@ -105,7 +105,7 @@ static void constructor2(const
v8::FunctionCallbackInfo<v8::Value>& info)
         exceptionState.throwIfNeeded();
         return;
     }
-    V8TRYCATCH_VOID(TestInterfaceEmpty*, optionalTestInterfaceEmptyArg,
V8TestInterfaceEmpty::hasInstance(info[6], info.GetIsolate(),
worldType(info.GetIsolate())) ?
V8TestInterfaceEmpty::toNative(v8::Handle<v8::Object>::Cast(info[6])) : 0);
+    V8TRYCATCH_VOID(TestInterfaceEmpty*, optionalTestInterfaceEmptyArg,
V8TestInterfaceEmpty::hasInstance(info[6], info.GetIsolate()) ?
V8TestInterfaceEmpty::toNative(v8::Handle<v8::Object>::Cast(info[6])) : 0);
     ExecutionContext* context = getExecutionContext();
     Document& document = *toDocument(getExecutionContext());
     RefPtr<TestInterfaceConstructor> impl =
TestInterfaceConstructor::create(context, document, doubleArg, stringArg,
testInterfaceEmptyArg, dictionaryArg, sequenceStringArg, optionalDictionaryArg,
optionalTestInterfaceEmptyArg, exceptionState);
@@ -123,7 +123,7 @@ static void constructor(const
v8::FunctionCallbackInfo<v8::Value>& info)
         TestInterfaceConstructorV8Internal::constructor1(info);
         return;
     }
-    if (((info.Length() == 5) && (V8TestInterfaceEmpty::hasInstance(info[2],
info.GetIsolate(), worldType(info.GetIsolate()))) && (info[4]->IsArray())) ||
((info.Length() == 6) && (V8TestInterfaceEmpty::hasInstance(info[2],
info.GetIsolate(), worldType(info.GetIsolate()))) && (info[4]->IsArray())) ||
((info.Length() == 7) && (V8TestInterfaceEmpty::hasInstance(info[2],
info.GetIsolate(), worldType(info.GetIsolate()))) && (info[4]->IsArray()) &&
(V8TestInterfaceEmpty::hasInstance(info[6], info.GetIsolate(),
worldType(info.GetIsolate()))))) {
+    if (((info.Length() == 5) && (V8TestInterfaceEmpty::hasInstance(info[2],
info.GetIsolate())) && (info[4]->IsArray())) || ((info.Length() == 6) &&
(V8TestInterfaceEmpty::hasInstance(info[2], info.GetIsolate())) &&
(info[4]->IsArray())) || ((info.Length() == 7) &&
(V8TestInterfaceEmpty::hasInstance(info[2], info.GetIsolate())) &&
(info[4]->IsArray()) && (V8TestInterfaceEmpty::hasInstance(info[6],
info.GetIsolate())))) {
         TestInterfaceConstructorV8Internal::constructor2(info);
         return;
     }
@@ -183,16 +183,10 @@ v8::Handle<v8::FunctionTemplate>
V8TestInterfaceConstructor::domTemplate(v8::Iso
     return handleScope.Escape(templ);
 }
 
-bool V8TestInterfaceConstructor::hasInstance(v8::Handle<v8::Value> jsValue,
v8::Isolate* isolate, WrapperWorldType currentWorldType)
+bool V8TestInterfaceConstructor::hasInstance(v8::Handle<v8::Value> jsValue,
v8::Isolate* isolate)
 {
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, currentWorldType);
-}
-
-bool V8TestInterfaceConstructor::hasInstanceInAnyWorld(v8::Handle<v8::Value>
jsValue, v8::Isolate* isolate)
-{
-    return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, MainWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, IsolatedWorld)
-        || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo,
jsValue, WorkerWorld);
+    return
V8PerIsolateData::from(isolate)->hasInstanceInMainWorld(&wrapperTypeInfo,
jsValue)
+        ||
V8PerIsolateData::from(isolate)->hasInstanceInNonMainWorld(&wrapperTypeInfo,
jsValue);
 }
 
 v8::Handle<v8::Object>
V8TestInterfaceConstructor::createWrapper(PassRefPtr<TestInterfaceConstructor>
impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)

[commit-bot: I haz the power, 2014-01-23 09:34:43]

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

[commit-bot: I haz the power, 2014-01-23 14:22:53]

Change committed as 165635