Unreviewed nit fixes after r196466.

* Modules/speech/SpeechSynthesisUtterance.idl: Fix curly bracket
  placement.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader): Use wrappableObject instead of domObject.
* bindings/scripts/test/*: Rebaseline.
* dom/WebKitNamedFlow.idl: Drop unnecessary #if case.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196476 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2aeabdc..fe4ebd5 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2016-02-12  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed nit fixes after r196466.
+
+        * Modules/speech/SpeechSynthesisUtterance.idl: Fix curly bracket
+          placement.
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader): Use wrappableObject instead of domObject.
+        * bindings/scripts/test/*: Rebaseline.
+        * dom/WebKitNamedFlow.idl: Drop unnecessary #if case.
+
 2016-02-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Properly handle classes inheriting from EventTarget

diff --git a/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.idl b/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.idl
index 5686db7..3d5d856 100644 (file)
--- a/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.idl
+++ b/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.idl
@@ -28,8 +28,7 @@
     EventTarget,
     ConstructorCallWith=ScriptExecutionContext,
     Constructor([Default=NullString] optional DOMString text)
-] interface SpeechSynthesisUtterance : EventTarget
-{
+] interface SpeechSynthesisUtterance : EventTarget {
     attribute DOMString text;
     attribute DOMString lang;
     attribute SpeechSynthesisVoice voice;

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 4d3c7d1..e2c50a8 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -1243,9 +1243,9 @@ sub GenerateHeader
         push(@headerContent, "    return &owner.get();\n");
         push(@headerContent, "}\n");
         push(@headerContent, "\n");
-        push(@headerContent, "inline void* wrapperKey($implType* domObject)\n");
+        push(@headerContent, "inline void* wrapperKey($implType* wrappableObject)\n");
         push(@headerContent, "{\n");
-        push(@headerContent, "    return domObject;\n");
+        push(@headerContent, "    return wrappableObject;\n");
         push(@headerContent, "}\n");
         push(@headerContent, "\n");
     }

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h
index 8e1d336..c5343c5 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h
@@ -78,9 +78,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestActiveDOMObject*
     return &owner.get();
 }
 
-inline void* wrapperKey(TestActiveDOMObject* domObject)
+inline void* wrapperKey(TestActiveDOMObject* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestActiveDOMObject*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h b/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h
index 9e447d4..ac61c71 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h
@@ -77,9 +77,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestClassWithJSBuilt
     return &owner.get();
 }
 
-inline void* wrapperKey(TestClassWithJSBuiltinConstructor* domObject)
+inline void* wrapperKey(TestClassWithJSBuiltinConstructor* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestClassWithJSBuiltinConstructor*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h
index 8d17bf8..1438bf9 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h
@@ -74,9 +74,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestCustomConstructo
     return &owner.get();
 }
 
-inline void* wrapperKey(TestCustomConstructorWithNoInterfaceObject* domObject)
+inline void* wrapperKey(TestCustomConstructorWithNoInterfaceObject* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCustomConstructorWithNoInterfaceObject*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h
index a3e5eea..f818dad 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h
@@ -81,9 +81,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestCustomNamedGette
     return &owner.get();
 }
 
-inline void* wrapperKey(TestCustomNamedGetter* domObject)
+inline void* wrapperKey(TestCustomNamedGetter* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCustomNamedGetter*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h
index ec620f8..5bc8936 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h
@@ -77,9 +77,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestEventConstructor
     return &owner.get();
 }
 
-inline void* wrapperKey(TestEventConstructor* domObject)
+inline void* wrapperKey(TestEventConstructor* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestEventConstructor*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestException.h b/Source/WebCore/bindings/scripts/test/JS/JSTestException.h
index e7b761a..aad9ba5 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestException.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestException.h
@@ -79,9 +79,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestException*)
     return &owner.get();
 }
 
-inline void* wrapperKey(TestException* domObject)
+inline void* wrapperKey(TestException* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestException*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h
index 9af6940..b11a3c3 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h
@@ -75,9 +75,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestGenerateIsReacha
     return &owner.get();
 }
 
-inline void* wrapperKey(TestGenerateIsReachable* domObject)
+inline void* wrapperKey(TestGenerateIsReachable* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestGenerateIsReachable*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h
index ebf0d62..ea6cec6 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h
@@ -102,9 +102,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestInterface*)
     return &owner.get();
 }
 
-inline void* wrapperKey(TestInterface* domObject)
+inline void* wrapperKey(TestInterface* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 WEBCORE_EXPORT JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestInterface*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h b/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h
index da51faa..dd98c29 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h
@@ -75,9 +75,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestMediaQueryListLi
     return &owner.get();
 }
 
-inline void* wrapperKey(TestMediaQueryListListener* domObject)
+inline void* wrapperKey(TestMediaQueryListListener* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestMediaQueryListListener*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h
index bbdab93..d1566a0 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h
@@ -76,9 +76,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestNamedConstructor
     return &owner.get();
 }
 
-inline void* wrapperKey(TestNamedConstructor* domObject)
+inline void* wrapperKey(TestNamedConstructor* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestNamedConstructor*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h b/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h
index c7f081a..a24df04 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h
@@ -75,9 +75,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestNondeterministic
     return &owner.get();
 }
 
-inline void* wrapperKey(TestNondeterministic* domObject)
+inline void* wrapperKey(TestNondeterministic* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestNondeterministic*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h
index f6ed924..734f236 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h
@@ -91,9 +91,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestObj*)
     return &owner.get();
 }
 
-inline void* wrapperKey(TestObj* domObject)
+inline void* wrapperKey(TestObj* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestObj*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h b/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h
index f4f97aa..ce235ed 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h
@@ -75,9 +75,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestOverloadedConstr
     return &owner.get();
 }
 
-inline void* wrapperKey(TestOverloadedConstructors* domObject)
+inline void* wrapperKey(TestOverloadedConstructors* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestOverloadedConstructors*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h
index 62b0e38..db70208 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h
@@ -82,9 +82,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestOverrideBuiltins
     return &owner.get();
 }
 
-inline void* wrapperKey(TestOverrideBuiltins* domObject)
+inline void* wrapperKey(TestOverrideBuiltins* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestOverrideBuiltins*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h b/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
index 3da5945..767d50f 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
@@ -81,9 +81,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestSerializedScript
     return &owner.get();
 }
 
-inline void* wrapperKey(TestSerializedScriptValueInterface* domObject)
+inline void* wrapperKey(TestSerializedScriptValueInterface* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestSerializedScriptValueInterface*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h b/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h
index ea98399..7d0d50d 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h
@@ -78,9 +78,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, TestTypedefs*)
     return &owner.get();
 }
 
-inline void* wrapperKey(TestTypedefs* domObject)
+inline void* wrapperKey(TestTypedefs* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestTypedefs*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSattribute.h b/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
index f1ee52d..f2d2aa6 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
@@ -76,9 +76,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, attribute*)
     return &owner.get();
 }
 
-inline void* wrapperKey(attribute* domObject)
+inline void* wrapperKey(attribute* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, attribute*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
index 8b521d7..36b569c 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
@@ -75,9 +75,9 @@ inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, readonly*)
     return &owner.get();
 }
 
-inline void* wrapperKey(readonly* domObject)
+inline void* wrapperKey(readonly* wrappableObject)
 {
-    return domObject;
+    return wrappableObject;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, readonly*);

diff --git a/Source/WebCore/dom/WebKitNamedFlow.idl b/Source/WebCore/dom/WebKitNamedFlow.idl
index e89b0e6..8662f8b 100644 (file)
--- a/Source/WebCore/dom/WebKitNamedFlow.idl
+++ b/Source/WebCore/dom/WebKitNamedFlow.idl
@@ -31,10 +31,7 @@
     NoInterfaceObject,
     EventTarget,
     GenerateIsReachable=ImplOwnerNodeRoot,
-] interface WebKitNamedFlow
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-: EventTarget
-#endif
+] interface WebKitNamedFlow : EventTarget
 {
     readonly attribute DOMString name;
     readonly attribute boolean overset;