Changeset 166070 in webkit

Timestamp:

Mar 21, 2014 10:29:03 AM (10 years ago)

Author:

msaboff@apple.com

Message:

Change CodeGeneratorJS.pm special cases for "DOMWindow" to be general purpose
​https://bugs.webkit.org/show_bug.cgi?id=130553

Reviewed by Geoffrey Garen.

Eliminated 'if ($interfaceName eq "DOMWindow") {' sections in CodeGeneratorJS where
it was used to do DOMWindow specific casting to a JSObject, either a JSDOMWindow* or
a JSDOMWindowShell*. Instead the code generator will use the existing
JSDOMWindow* toJSDOMWindow(JSValue value) function based on a newly added attribute
"CustomProxyToJSObject". That attribute will emit a call to the function
${className}* to${className}(JSValue).

This is being done to clean up the code generator and for a subsequent patch that
will use a similar custom to{className} function for workers,
JSDedicatedWorkerGlobalScope* toJSDedicatedWorkerGlobalScope(JSValue).

Changes covered by existing tests.

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

• bindings/scripts/IDLAttributes.txt:
• page/DOMWindow.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (5 diffs)
• bindings/scripts/IDLAttributes.txt (modified) (1 diff)
• page/DOMWindow.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-21  Michael Saboff  <msaboff@apple.com>
+
+        Change CodeGeneratorJS.pm special cases for "DOMWindow" to be general purpose
+        https://bugs.webkit.org/show_bug.cgi?id=130553
+
+        Reviewed by Geoffrey Garen.
+
+        Eliminated 'if ($interfaceName eq "DOMWindow") {' sections in CodeGeneratorJS where
+        it was used to do DOMWindow specific casting to a JSObject, either a JSDOMWindow* or
+        a JSDOMWindowShell*.  Instead the code generator will use the existing 
+        JSDOMWindow* toJSDOMWindow(JSValue value) function based on a newly added attribute
+        "CustomProxyToJSObject".  That attribute will emit a call to the function
+        ${className}* to${className}(JSValue).
+
+        This is being done to clean up the code generator and for a subsequent patch that
+        will use a similar custom to{className} function for workers,
+        JSDedicatedWorkerGlobalScope* toJSDedicatedWorkerGlobalScope(JSValue).
+
+        Changes covered by existing tests.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementation):
+        * bindings/scripts/IDLAttributes.txt:
+        * page/DOMWindow.idl:
+
 2014-03-21  Krzysztof Czech  <k.czech@samsung.com>
 

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

@@ -2128 +2128 @@
 
             if (!$attribute->isStatic || $attribute->signature->type =~ /Constructor$/) {
-                if ($interfaceName eq "DOMWindow") {
-                    push(@implContent, "    ${className}* castedThis = jsDynamicCast<$className*>(JSValue::decode(thisValue));\n");
-                    push(@implContent, "    if (UNLIKELY(!castedThis)) {\n");
-                    push(@implContent, "        if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
-                    push(@implContent, "            castedThis = shell->window();\n");
-                    push(@implContent, "    }\n");
+                if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
+                    push(@implContent, "    ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
                     push(@implContent, "    UNUSED_PARAM(slotBase);\n");
                 } else {
@@ -2351 +2347 @@
             push(@implContent, "    UNUSED_PARAM(baseValue);\n");
             push(@implContent, "    UNUSED_PARAM(thisValue);\n");
-            if ($interfaceName eq "DOMWindow") {
-                push(@implContent, "    ${className}* domObject = jsDynamicCast<$className*>(JSValue::decode(thisValue));\n");
-                push(@implContent, "    if (!domObject) {\n");
-                push(@implContent, "        if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
-                push(@implContent, "            domObject = shell->window();\n");
-                push(@implContent, "    }\n");
+            if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
+                push(@implContent, "    ${className}* domObject = to${className}(JSValue::decode(thisValue));\n");
             } else {
                 push(@implContent, "    ${className}* domObject = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n") if ConstructorShouldBeOnInstance($interface);
@@ -2380 +2372 @@
             push(@implContent, "{\n");
             push(@implContent, "    JSValue value = JSValue::decode(encodedValue);");
-            push(@implContent, "    ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
-            if ($interfaceName eq "DOMWindow") {
-                push(@implContent, "    if (UNLIKELY(!castedThis)) {\n");
-                push(@implContent, "        if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
-                push(@implContent, "            castedThis = shell->window();\n");
-                push(@implContent, "    }\n");
+            if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
+                push(@implContent, "    ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
+            } else {
+                push(@implContent, "    ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
             }
             push(@implContent, "    if (UNLIKELY(!castedThis)) {\n");
@@ -2489 +2479 @@
                 push(@implContent, "    UNUSED_PARAM(exec);\n");
                 if (!$attribute->isStatic) {
-                    push(@implContent, "    ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
-                    if ($interfaceName eq "DOMWindow") {
-                        push(@implContent, "    if (UNLIKELY(!castedThis)) {\n");
-                        push(@implContent, "        if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
-                        push(@implContent, "            castedThis = shell->window();\n");
-                        push(@implContent, "    }\n");
+                    if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
+                        push(@implContent, "    ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
+                    } else {
+                        push(@implContent, "    ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
                     }
                     push(@implContent, "    if (UNLIKELY(!castedThis)) {\n");
@@ -2719 +2707 @@
                 }
             } else {
-                if ($interfaceName eq "DOMWindow") {
-                    push(@implContent, "    $className* castedThis = toJSDOMWindow(exec->hostThisValue().toThis(exec, NotStrictMode));\n");
+                if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
+                    push(@implContent, "    $className* castedThis = to${className}(exec->hostThisValue().toThis(exec, NotStrictMode));\n");
                     push(@implContent, "    if (UNLIKELY(!castedThis))\n");
                     push(@implContent, "        return throwVMTypeError(exec);\n");

trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt

@@ -44 +44 @@
 CustomNamedGetter
 CustomNamedSetter
+CustomProxyToJSObject
 CustomPutFunction
 CustomReturn

trunk/Source/WebCore/page/DOMWindow.idl

@@ -31 +31 @@
     CustomGetOwnPropertySlot,
     CustomEnumerateProperty,
+    CustomProxyToJSObject,
     JSCustomMarkFunction,
     JSCustomToNativeObject,