Title: [155233] trunk/Source/WebCore
Revision
155233
Author
akl...@apple.com
Date
2013-09-06 19:38:12 -0700 (Fri, 06 Sep 2013)

Log Message

Make Obj-C bindings generator less #include-happy.
<https://webkit.org/b/120913>

Reviewed by Anders Carlsson.

Knock out an old FIXME in CodeGeneratorObjC.pm and avoid including unrelated
interface declarations from implementation files where they are not needed.

* bindings/scripts/CodeGeneratorObjC.pm:
(GenerateImplementation):

    Only include DOMFooInternal.h relevant to the current interface.

* bindings/scripts/test/ObjC/*

    Rebaseline Obj-C bindings tests now that they include fewer things.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (155232 => 155233)


--- trunk/Source/WebCore/ChangeLog	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/ChangeLog	2013-09-07 02:38:12 UTC (rev 155233)
@@ -1,5 +1,24 @@
 2013-09-06  Andreas Kling  <akl...@apple.com>
 
+        Make Obj-C bindings generator less #include-happy.
+        <https://webkit.org/b/120913>
+
+        Reviewed by Anders Carlsson.
+
+        Knock out an old FIXME in CodeGeneratorObjC.pm and avoid including unrelated
+        interface declarations from implementation files where they are not needed.
+
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        (GenerateImplementation):
+
+            Only include DOMFooInternal.h relevant to the current interface.
+
+        * bindings/scripts/test/ObjC/*
+
+            Rebaseline Obj-C bindings tests now that they include fewer things.
+
+2013-09-06  Andreas Kling  <akl...@apple.com>
+
         Rebaseline bindings tests after Swedish breakage.
 
 2013-09-06  Andreas Kling  <akl...@apple.com>

Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -1132,15 +1132,13 @@
     $implIncludes{"JSMainThreadExecState.h"} = 1;
     $implIncludes{"WebScriptObjectPrivate.h"} = 1;
     $implIncludes{$classHeaderName . "Internal.h"} = 1;
-
-    # FIXME: These includes are only needed when the class is a subclass of one of these polymorphic classes.
-    $implIncludes{"DOMBlobInternal.h"} = 1;
-    $implIncludes{"DOMCSSRuleInternal.h"} = 1;
-    $implIncludes{"DOMCSSValueInternal.h"} = 1;
-    $implIncludes{"DOMEventInternal.h"} = 1;
     $implIncludes{"DOMNodeInternal.h"} = 1;
-    $implIncludes{"DOMStyleSheetInternal.h"} = 1;
 
+    $implIncludes{"DOMBlobInternal.h"} = 1 if $interfaceName eq "File";
+    $implIncludes{"DOMCSSRuleInternal.h"} = 1 if $interfaceName =~ /.*CSS.*Rule/;
+    $implIncludes{"DOMCSSValueInternal.h"} = 1 if $interfaceName =~ /.*CSS.*Value/;
+    $implIncludes{"DOMEventInternal.h"} = 1 if $interfaceName =~ /.*Event/;
+    $implIncludes{"DOMStyleSheetInternal.h"} = 1 if $interfaceName eq "CSSStyleSheet";
     $implIncludes{"DOMSVGPathSegInternal.h"} = 1 if $interfaceName =~ /^SVGPathSeg.+/;
 
     if ($interfaceName =~ /(\w+)(Abs|Rel)$/) {

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,7 @@
 
 #import "DOMTestActiveDOMObject.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestActiveDOMObjectInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -34,17 +34,12 @@
 
 #import "Class5.h"
 #import "Class6.h"
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
 #import "DOMClass5Internal.h"
 #import "DOMClass6Internal.h"
 #import "DOMDOMStringListInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMFloat32ArrayInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMStringList.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestCallbackInternal.h"
 #import "DOMTestNodeInternal.h"
 #import "ExceptionHandlers.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,7 @@
 
 #import "DOMTestCustomNamedGetter.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestCustomNamedGetterInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,8 @@
 
 #import "DOMTestEventConstructor.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
 #import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestEventConstructorInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,8 @@
 
 #import "DOMTestEventTarget.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
 #import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestEventTargetInternal.h"
 #import "Event.h"
 #import "EventListener.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,7 @@
 
 #import "DOMTestException.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestExceptionInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -32,12 +32,7 @@
 
 #import "DOMTestInterface.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestInterfaceInternal.h"
 #import "DOMTestObjInternal.h"
 #import "ExceptionHandlers.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,13 +29,8 @@
 
 #import "DOMTestMediaQueryListListener.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMMediaQueryListListenerInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestMediaQueryListListenerInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,7 @@
 
 #import "DOMTestNamedConstructor.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestNamedConstructorInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,7 @@
 
 #import "DOMTestNode.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestNodeInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,16 +29,11 @@
 
 #import "DOMTestObj.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
 #import "DOMDictionaryInternal.h"
 #import "DOMDocumentInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMSVGDocumentInternal.h"
 #import "DOMSVGPointInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestEnumTypeInternal.h"
 #import "DOMTestNodeInternal.h"
 #import "DOMTestObjInternal.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,12 +29,7 @@
 
 #import "DOMTestOverloadedConstructors.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestOverloadedConstructorsInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -32,12 +32,7 @@
 
 #import "DOMTestSerializedScriptValueInterface.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestSerializedScriptValueInterfaceInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"

Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm (155232 => 155233)


--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm	2013-09-07 02:35:57 UTC (rev 155232)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm	2013-09-07 02:38:12 UTC (rev 155233)
@@ -29,13 +29,8 @@
 
 #import "DOMTestTypedefs.h"
 
-#import "DOMBlobInternal.h"
-#import "DOMCSSRuleInternal.h"
-#import "DOMCSSValueInternal.h"
-#import "DOMEventInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMSVGPointInternal.h"
-#import "DOMStyleSheetInternal.h"
 #import "DOMTestTypedefsInternal.h"
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to