Changeset 135325 in webkit

Timestamp:

Nov 20, 2012, 3:50:59 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[V8] Pass ScriptState::current() to functions marked with CallWith=ScriptState
​https://bugs.webkit.org/show_bug.cgi?id=102739

Patch by Michael Pruett <​michael@68k.org> on 2012-11-20
Reviewed by Kentaro Hara.

Previously EmptyScriptState rather than ScriptState::current()
was passed to functions marked with [CallWith=ScriptState].
Since the EmptyScriptState has a null v8::Context, any functions
which depended upon a valid v8::Context would fail.

No new tests. Covered by existing tests.

• bindings/scripts/CodeGeneratorV8.pm:

(GenerateNormalAttrGetter):
(GenerateNormalAttrSetter):
(GenerateCallWith):
(GenerateFunctionCallString):

• bindings/v8/ScriptState.h:

(WebCore::ScriptState::clearException): Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (5 diffs)
• bindings/v8/ScriptState.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-20  Michael Pruett  <michael@68k.org>
+
+        [V8] Pass ScriptState::current() to functions marked with CallWith=ScriptState
+        https://bugs.webkit.org/show_bug.cgi?id=102739
+
+        Reviewed by Kentaro Hara.
+
+        Previously EmptyScriptState rather than ScriptState::current()
+        was passed to functions marked with [CallWith=ScriptState].
+        Since the EmptyScriptState has a null v8::Context, any functions
+        which depended upon a valid v8::Context would fail.
+
+        No new tests. Covered by existing tests.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GenerateNormalAttrGetter):
+        (GenerateNormalAttrSetter):
+        (GenerateCallWith):
+        (GenerateFunctionCallString):
+        * bindings/v8/ScriptState.h:
+        (WebCore::ScriptState::clearException): Added.
+
 2012-11-20  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -983 +983 @@
             $functionName = "imp->${functionName}";
         }
-        unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 0, 0));
+        unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 0));
         $getterString = "${functionName}(" . join(", ", @arguments) . ")";
     } else {
@@ -1300 +1300 @@
                 $functionName = "imp->${functionName}";
             }
-            unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 1, 0));
+            unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 1));
             push(@implContentDecls, "    ${functionName}(" . join(", ", @arguments) . ");\n");
         }
@@ -1622 +1622 @@
     my $indent = shift;
     my $returnVoid = shift;
-    my $emptyContext = shift;
     my $function = shift;
 
     my @callWithArgs;
     if ($codeGenerator->ExtendedAttributeContains($callWith, "ScriptState")) {
-        if ($emptyContext) {
-            push(@$outputArray, $indent . "EmptyScriptState state;\n");
-            push(@callWithArgs, "&state");
-        } else {
-            push(@$outputArray, $indent . "ScriptState* state = ScriptState::current();\n");
-            push(@$outputArray, $indent . "if (!state)\n");
-            push(@$outputArray, $indent . "    return" . ($returnVoid ? "" : " v8Undefined()") . ";\n");
-            push(@callWithArgs, "state");
-        }
+        push(@$outputArray, $indent . "ScriptState* currentState = ScriptState::current();\n");
+        push(@$outputArray, $indent . "if (!currentState)\n");
+        push(@$outputArray, $indent . "    return" . ($returnVoid ? "" : " v8Undefined()") . ";\n");
+        push(@$outputArray, $indent . "ScriptState& state = *currentState;\n");
+        push(@callWithArgs, "&state");
     }
     if ($codeGenerator->ExtendedAttributeContains($callWith, "ScriptExecutionContext")) {
@@ -3533 +3528 @@
     my $callWith = $function->signature->extendedAttributes->{"CallWith"};
     my @callWithOutput = ();
-    my @callWithArgs = GenerateCallWith($callWith, \@callWithOutput, $indent, 0, 1, $function);
+    my @callWithArgs = GenerateCallWith($callWith, \@callWithOutput, $indent, 0, $function);
     $result .= join("", @callWithOutput);
     unshift(@arguments, @callWithArgs);
@@ -3591 +3586 @@
 
     if ($codeGenerator->ExtendedAttributeContains($callWith, "ScriptState")) {
-        $result .= $indent . "if (state.hadException())\n";
-        $result .= $indent . "    return throwError(state.exception(), args.GetIsolate());\n"
+        $result .= $indent . "if (state.hadException()) {\n";
+        $result .= $indent . "    v8::Local<v8::Value> exception = state.exception();\n";
+        $result .= $indent . "    state.clearException();\n";
+        $result .= $indent . "    return throwError(exception, args.GetIsolate());\n";
+        $result .= $indent . "}\n";
     }
 

trunk/Source/WebCore/bindings/v8/ScriptState.h

@@ -57 +57 @@
     }
     v8::Local<v8::Value> exception() { return m_exception; }
+    void clearException() { m_exception.Clear(); }
 
     v8::Local<v8::Context> context() const