Do not require JS*Custom.h header if [CustomPutFunction] / [CustomNamedSetter] is...
authorch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Jun 2013 17:12:23 +0000 (17:12 +0000)
committerch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Jun 2013 17:12:23 +0000 (17:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=117795

Reviewed by Kentaro Hara.

Fix the JS bindings generator so that it stops including JS*Custom.h header whenever
[CustomPutFunction] or [CustomNamedSetter] IDL extended attributes are used. We don't
really need this custom header and this forces the developer to create dummy custom
headers so that it builds.

If the developer really needs such custom header to be included, he can still use
[JSCustomHeader] IDL extended attribute to do so.

This patch also remove the dummy custom headers that were created but are no longer
required to build.

No new tests, no behavior change. Already covered by the following bindings test:
TestInterface.idl

* GNUmakefile.list.am:
* Target.pri:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSDOMStringMapCustom.h: Removed.
* bindings/js/JSHTMLAppletElementCustom.cpp:
* bindings/js/JSHTMLAppletElementCustom.h: Removed.
* bindings/js/JSHTMLEmbedElementCustom.cpp:
* bindings/js/JSHTMLEmbedElementCustom.h: Removed.
* bindings/js/JSHTMLObjectElementCustom.cpp:
* bindings/js/JSHTMLObjectElementCustom.h: Removed.
* bindings/js/JSHistoryCustom.cpp:
* bindings/js/JSHistoryCustom.h: Removed.
* bindings/js/JSLocationCustom.cpp:
* bindings/js/JSLocationCustom.h: Removed.
* bindings/js/JSStorageCustom.cpp:
* bindings/js/JSStorageCustom.h: Removed.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):

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

21 files changed:
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSDOMStringMapCustom.h [deleted file]
Source/WebCore/bindings/js/JSHTMLAppletElementCustom.cpp
Source/WebCore/bindings/js/JSHTMLAppletElementCustom.h [deleted file]
Source/WebCore/bindings/js/JSHTMLEmbedElementCustom.cpp
Source/WebCore/bindings/js/JSHTMLEmbedElementCustom.h [deleted file]
Source/WebCore/bindings/js/JSHTMLObjectElementCustom.cpp
Source/WebCore/bindings/js/JSHTMLObjectElementCustom.h [deleted file]
Source/WebCore/bindings/js/JSHistoryCustom.cpp
Source/WebCore/bindings/js/JSHistoryCustom.h [deleted file]
Source/WebCore/bindings/js/JSLocationCustom.cpp
Source/WebCore/bindings/js/JSLocationCustom.h [deleted file]
Source/WebCore/bindings/js/JSStorageCustom.cpp
Source/WebCore/bindings/js/JSStorageCustom.h [deleted file]
Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

index dce4206..1745c64 100644 (file)
@@ -1,3 +1,45 @@
+2013-06-19  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        Do not require JS*Custom.h header if [CustomPutFunction] / [CustomNamedSetter] is used
+        https://bugs.webkit.org/show_bug.cgi?id=117795
+
+        Reviewed by Kentaro Hara.
+
+        Fix the JS bindings generator so that it stops including JS*Custom.h header whenever
+        [CustomPutFunction] or [CustomNamedSetter] IDL extended attributes are used. We don't
+        really need this custom header and this forces the developer to create dummy custom
+        headers so that it builds.
+
+        If the developer really needs such custom header to be included, he can still use
+        [JSCustomHeader] IDL extended attribute to do so.
+
+        This patch also remove the dummy custom headers that were created but are no longer
+        required to build.
+
+        No new tests, no behavior change. Already covered by the following bindings test:
+        TestInterface.idl
+
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSDOMStringMapCustom.h: Removed.
+        * bindings/js/JSHTMLAppletElementCustom.cpp:
+        * bindings/js/JSHTMLAppletElementCustom.h: Removed.
+        * bindings/js/JSHTMLEmbedElementCustom.cpp:
+        * bindings/js/JSHTMLEmbedElementCustom.h: Removed.
+        * bindings/js/JSHTMLObjectElementCustom.cpp:
+        * bindings/js/JSHTMLObjectElementCustom.h: Removed.
+        * bindings/js/JSHistoryCustom.cpp:
+        * bindings/js/JSHistoryCustom.h: Removed.
+        * bindings/js/JSLocationCustom.cpp:
+        * bindings/js/JSLocationCustom.h: Removed.
+        * bindings/js/JSStorageCustom.cpp:
+        * bindings/js/JSStorageCustom.h: Removed.
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader):
+
 2013-06-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [BlackBerry] Several tests crash due to an assert when creating an ImageBuffer
index 40f4bf9..2eed954 100644 (file)
@@ -2378,7 +2378,6 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSDOMPluginCustom.cpp \
        Source/WebCore/bindings/js/JSDOMStringListCustom.cpp \
        Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp \
-       Source/WebCore/bindings/js/JSDOMStringMapCustom.h \
        Source/WebCore/bindings/js/JSDOMTokenListCustom.cpp \
        Source/WebCore/bindings/js/JSDOMWindowBase.cpp \
        Source/WebCore/bindings/js/JSDOMWindowBase.h \
@@ -2408,13 +2407,11 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSGeolocationCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLAppletElementCustom.cpp \
-       Source/WebCore/bindings/js/JSHTMLAppletElementCustom.h \
        Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLElementCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLEmbedElementCustom.cpp \
-       Source/WebCore/bindings/js/JSHTMLEmbedElementCustom.h \
        Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp \
@@ -2424,14 +2421,12 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSHTMLLinkElementCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLObjectElementCustom.cpp \
-       Source/WebCore/bindings/js/JSHTMLObjectElementCustom.h \
        Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLSelectElementCustom.h \
        Source/WebCore/bindings/js/JSHTMLStyleElementCustom.cpp \
        Source/WebCore/bindings/js/JSHTMLTemplateElementCustom.cpp \
        Source/WebCore/bindings/js/JSHistoryCustom.cpp \
-       Source/WebCore/bindings/js/JSHistoryCustom.h \
        Source/WebCore/bindings/js/JSIDBAnyCustom.cpp \
        Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp \
        Source/WebCore/bindings/js/JSIDBObjectStoreCustom.cpp \
@@ -2445,7 +2440,6 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSLazyEventListener.cpp \
        Source/WebCore/bindings/js/JSLazyEventListener.h \
        Source/WebCore/bindings/js/JSLocationCustom.cpp \
-       Source/WebCore/bindings/js/JSLocationCustom.h \
        Source/WebCore/bindings/js/JSMainThreadExecState.cpp \
        Source/WebCore/bindings/js/JSMainThreadExecState.h \
        Source/WebCore/bindings/js/JSMediaListCustom.h \
@@ -2480,7 +2474,6 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp \
        Source/WebCore/bindings/js/JSSharedWorkerCustom.cpp \
        Source/WebCore/bindings/js/JSStorageCustom.cpp \
-       Source/WebCore/bindings/js/JSStorageCustom.h \
        Source/WebCore/bindings/js/JSStyleSheetCustom.cpp \
        Source/WebCore/bindings/js/JSStyleSheetCustom.h \
        Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp \
index bf6e82e..b35fb68 100644 (file)
@@ -1355,27 +1355,20 @@ HEADERS += \
     bindings/js/JSDictionary.h \
     bindings/js/JSDOMBinding.h \
     bindings/js/JSDOMGlobalObject.h \
-    bindings/js/JSDOMStringMapCustom.h \
     bindings/js/JSDOMWindowBase.h \
     bindings/js/JSDOMWindowCustom.h \
     bindings/js/JSDOMWindowShell.h \
     bindings/js/JSDOMWrapper.h \
     bindings/js/JSErrorHandler.h \
     bindings/js/JSEventListener.h \
-    bindings/js/JSHTMLAppletElementCustom.h \
-    bindings/js/JSHTMLEmbedElementCustom.h \
     bindings/js/JSHTMLInputElementCustom.h \
-    bindings/js/JSHTMLObjectElementCustom.h \
     bindings/js/JSHTMLSelectElementCustom.h \
-    bindings/js/JSHistoryCustom.h \
     bindings/js/JSImageConstructor.h \
     bindings/js/JSLazyEventListener.h \
-    bindings/js/JSLocationCustom.h \
     bindings/js/JSMutationCallback.h \
     bindings/js/JSNodeCustom.h \
     bindings/js/JSNodeFilterCondition.h \
     bindings/js/JSPluginElementFunctions.h \
-    bindings/js/JSStorageCustom.h \
     bindings/js/JSWorkerContextBase.h \
     bindings/js/JavaScriptCallFrame.h \
     bindings/js/PageScriptDebugServer.h \
index 9bd9c40..927ff16 100644 (file)
     <ClInclude Include="..\bindings\js\JSDictionary.h" />
     <ClInclude Include="..\bindings\js\JSDOMBinding.h" />
     <ClInclude Include="..\bindings\js\JSDOMGlobalObject.h" />
-    <ClInclude Include="..\bindings\js\JSDOMStringMapCustom.h" />
     <ClInclude Include="..\bindings\js\JSDOMWindowBase.h" />
     <ClInclude Include="..\bindings\js\JSDOMWindowCustom.h" />
     <ClInclude Include="..\bindings\js\JSDOMWindowShell.h" />
     <ClInclude Include="..\bindings\js\JSErrorHandler.h" />
     <ClInclude Include="..\bindings\js\JSEventListener.h" />
     <ClInclude Include="..\bindings\js\JSExceptionBase.h" />
-    <ClInclude Include="..\bindings\js\JSHistoryCustom.h" />
-    <ClInclude Include="..\bindings\js\JSHTMLAppletElementCustom.h" />
-    <ClInclude Include="..\bindings\js\JSHTMLEmbedElementCustom.h" />
     <ClInclude Include="..\bindings\js\JSHTMLInputElementCustom.h" />
-    <ClInclude Include="..\bindings\js\JSHTMLObjectElementCustom.h" />
     <ClInclude Include="..\bindings\js\JSHTMLSelectElementCustom.h" />
     <ClInclude Include="..\bindings\js\JSImageConstructor.h" />
     <ClInclude Include="..\bindings\js\JSLazyEventListener.h" />
-    <ClInclude Include="..\bindings\js\JSLocationCustom.h" />
     <ClInclude Include="..\bindings\js\JSMainThreadExecState.h" />
     <ClInclude Include="..\bindings\js\JSMessagePortCustom.h" />
     <ClInclude Include="..\bindings\js\JSMutationCallback.h" />
     <ClInclude Include="..\bindings\js\JSNodeCustom.h" />
     <ClInclude Include="..\bindings\js\JSNodeFilterCondition.h" />
     <ClInclude Include="..\bindings\js\JSPluginElementFunctions.h" />
-    <ClInclude Include="..\bindings\js\JSStorageCustom.h" />
     <ClInclude Include="..\bindings\js\JSWorkerContextBase.h" />
     <ClInclude Include="..\bindings\js\PageScriptDebugServer.h" />
     <ClInclude Include="..\bindings\js\ScheduledAction.h" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 91a2375..e77a2e0 100644 (file)
     <ClInclude Include="..\bindings\js\JSDOMGlobalObject.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\JSDOMStringMapCustom.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
     <ClInclude Include="..\bindings\js\JSErrorHandler.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\JSHTMLEmbedElementCustom.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
     <ClInclude Include="..\bindings\js\JSHTMLInputElementCustom.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\JSHTMLObjectElementCustom.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
     <ClInclude Include="..\bindings\js\JSHTMLSelectElementCustom.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
     <ClInclude Include="..\bindings\js\JSLazyEventListener.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\JSLocationCustom.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
     <ClInclude Include="..\bindings\js\JSMainThreadExecState.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
     <ClInclude Include="..\bindings\js\JSPluginElementFunctions.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\JSStorageCustom.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
     <ClInclude Include="..\bindings\js\JSWorkerContextBase.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
     <ClInclude Include="..\bindings\js\JSExceptionBase.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\JSHistoryCustom.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
-    <ClInclude Include="..\bindings\js\JSHTMLAppletElementCustom.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
     <ClInclude Include="..\bindings\js\JSDOMWindowBase.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
       <Filter>rendering</Filter>
     </CustomBuildStep>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index e91ad2a..20d5d6f 100644 (file)
                E1AD12D61295D0BD00ACA989 /* JSProcessingInstructionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1AD12D51295D0BD00ACA989 /* JSProcessingInstructionCustom.cpp */; };
                E1AD139B1295D92600ACA989 /* JSHTMLLinkElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1AD139A1295D92600ACA989 /* JSHTMLLinkElementCustom.cpp */; };
                E1AD139E1295D96100ACA989 /* JSHTMLStyleElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1AD139D1295D96100ACA989 /* JSHTMLStyleElementCustom.cpp */; };
-               E1AD141E1295EA4F00ACA989 /* JSHTMLAppletElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AD141D1295EA4F00ACA989 /* JSHTMLAppletElementCustom.h */; };
-               E1AD14211295EA6B00ACA989 /* JSHTMLEmbedElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AD14201295EA6B00ACA989 /* JSHTMLEmbedElementCustom.h */; };
                E1AD14231295EA7F00ACA989 /* JSHTMLInputElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AD14221295EA7F00ACA989 /* JSHTMLInputElementCustom.h */; };
-               E1AD14251295EA9500ACA989 /* JSHTMLObjectElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AD14241295EA9500ACA989 /* JSHTMLObjectElementCustom.h */; };
                E1AD147C1297307E00ACA989 /* JSCSSImportRuleCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1AD147B1297307E00ACA989 /* JSCSSImportRuleCustom.cpp */; };
                E1AD14911297337400ACA989 /* JSCSSFontFaceRuleCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1AD14901297337400ACA989 /* JSCSSFontFaceRuleCustom.cpp */; };
                E1AD14A31297345300ACA989 /* JSCSSMediaRuleCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1AD14A21297345300ACA989 /* JSCSSMediaRuleCustom.cpp */; };
                E1AD12D51295D0BD00ACA989 /* JSProcessingInstructionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSProcessingInstructionCustom.cpp; sourceTree = "<group>"; };
                E1AD139A1295D92600ACA989 /* JSHTMLLinkElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLLinkElementCustom.cpp; sourceTree = "<group>"; };
                E1AD139D1295D96100ACA989 /* JSHTMLStyleElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLStyleElementCustom.cpp; sourceTree = "<group>"; };
-               E1AD141D1295EA4F00ACA989 /* JSHTMLAppletElementCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLAppletElementCustom.h; sourceTree = "<group>"; };
-               E1AD14201295EA6B00ACA989 /* JSHTMLEmbedElementCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLEmbedElementCustom.h; sourceTree = "<group>"; };
                E1AD14221295EA7F00ACA989 /* JSHTMLInputElementCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLInputElementCustom.h; sourceTree = "<group>"; };
-               E1AD14241295EA9500ACA989 /* JSHTMLObjectElementCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLObjectElementCustom.h; sourceTree = "<group>"; };
                E1AD147B1297307E00ACA989 /* JSCSSImportRuleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSImportRuleCustom.cpp; sourceTree = "<group>"; };
                E1AD14901297337400ACA989 /* JSCSSFontFaceRuleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSFontFaceRuleCustom.cpp; sourceTree = "<group>"; };
                E1AD14A21297345300ACA989 /* JSCSSMediaRuleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSMediaRuleCustom.cpp; sourceTree = "<group>"; };
                                BCE7B1920D4E86960075A539 /* JSHistoryCustom.cpp */,
                                BC97E42B10915B060010D361 /* JSHTMLAllCollectionCustom.cpp */,
                                BC4EDEF30C08F3FB007EDD49 /* JSHTMLAppletElementCustom.cpp */,
-                               E1AD141D1295EA4F00ACA989 /* JSHTMLAppletElementCustom.h */,
                                9392262C1032107B006E7D5D /* JSHTMLCanvasElementCustom.cpp */,
                                BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */,
                                BC51580A0C03D404008BB0EE /* JSHTMLDocumentCustom.cpp */,
                                BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */,
                                BC6D44BD0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp */,
-                               E1AD14201295EA6B00ACA989 /* JSHTMLEmbedElementCustom.h */,
                                9B1AB07B1648C7C40051F3F2 /* JSHTMLFormControlsCollectionCustom.cpp */,
                                A8D065AD0A2446CD005E7203 /* JSHTMLFormElementCustom.cpp */,
                                BC2ED7A40C6C0F3600920BFF /* JSHTMLFrameElementCustom.cpp */,
                                E1AD139A1295D92600ACA989 /* JSHTMLLinkElementCustom.cpp */,
                                CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */,
                                BC305CA30C0781BB00CD20F0 /* JSHTMLObjectElementCustom.cpp */,
-                               E1AD14241295EA9500ACA989 /* JSHTMLObjectElementCustom.h */,
                                448AD27A0A4813790023D179 /* JSHTMLOptionsCollectionCustom.cpp */,
                                BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */,
                                AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */,
                                BC97E413109154FA0010D361 /* JSHTMLAllCollection.h in Headers */,
                                1A4A2DF00A1B852A00C807F8 /* JSHTMLAnchorElement.h in Headers */,
                                1A4A2DF20A1B852A00C807F8 /* JSHTMLAppletElement.h in Headers */,
-                               E1AD141E1295EA4F00ACA989 /* JSHTMLAppletElementCustom.h in Headers */,
                                1AE2AA1F0A1CDAB400B42B25 /* JSHTMLAreaElement.h in Headers */,
                                E44614380CD689C500FADA75 /* JSHTMLAudioElement.h in Headers */,
                                A80E7B110A19D606007FB8C5 /* JSHTMLBaseElement.h in Headers */,
                                1A494BFB0A122F4400FDAFC1 /* JSHTMLElement.h in Headers */,
                                938E65F109F09840008A48EC /* JSHTMLElementWrapperFactory.h in Headers */,
                                BC6D44ED0C07F2ED0072D2C9 /* JSHTMLEmbedElement.h in Headers */,
-                               E1AD14211295EA6B00ACA989 /* JSHTMLEmbedElementCustom.h in Headers */,
                                1AE2AA270A1CDAB400B42B25 /* JSHTMLFieldSetElement.h in Headers */,
                                1AE2AA290A1CDAB400B42B25 /* JSHTMLFontElement.h in Headers */,
                                9BF9A8811648DD2F001C6B23 /* JSHTMLFormControlsCollection.h in Headers */,
                                A7BBE26711AFB3F20005EA03 /* JSHTMLMeterElement.h in Headers */,
                                1AE2AB2A0A1CE63B00B42B25 /* JSHTMLModElement.h in Headers */,
                                BC305C7A0C076BB300CD20F0 /* JSHTMLObjectElement.h in Headers */,
-                               E1AD14251295EA9500ACA989 /* JSHTMLObjectElementCustom.h in Headers */,
                                1A85B1EB0A1B240500D8C87C /* JSHTMLOListElement.h in Headers */,
                                A80E7E9B0A1A83E3007FB8C5 /* JSHTMLOptGroupElement.h in Headers */,
                                A80E7E990A1A83E3007FB8C5 /* JSHTMLOptionElement.h in Headers */,
diff --git a/Source/WebCore/bindings/js/JSDOMStringMapCustom.h b/Source/WebCore/bindings/js/JSDOMStringMapCustom.h
deleted file mode 100644 (file)
index 095fd21..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSDOMStringMapCustom_h
-#define JSDOMStringMapCustom_h
-
-#include "JSDOMStringMap.h"
-
-#endif // JSDOMStringMapCustom_h
index c1c2897..8ab69d7 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "JSHTMLAppletElementCustom.h"
+#include "JSHTMLAppletElement.h"
 
 #include "HTMLAppletElement.h"
 #include "JSPluginElementFunctions.h"
diff --git a/Source/WebCore/bindings/js/JSHTMLAppletElementCustom.h b/Source/WebCore/bindings/js/JSHTMLAppletElementCustom.h
deleted file mode 100644 (file)
index 5df9a66..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSHTMLAppletElementCustom_h
-#define JSHTMLAppletElementCustom_h
-
-#include "JSHTMLAppletElement.h"
-
-#endif // JSHTMLAppletElementCustom_h
index 8b97603..fe58783 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "JSHTMLEmbedElementCustom.h"
+#include "JSHTMLEmbedElement.h"
 
 #include "HTMLEmbedElement.h"
 #include "JSPluginElementFunctions.h"
diff --git a/Source/WebCore/bindings/js/JSHTMLEmbedElementCustom.h b/Source/WebCore/bindings/js/JSHTMLEmbedElementCustom.h
deleted file mode 100644 (file)
index 58833ae..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSHTMLEmbedElementCustom_h
-#define JSHTMLEmbedElementCustom_h
-
-#include "JSHTMLEmbedElement.h"
-
-#endif // JSHTMLEmbedElementCustom_h
index b3bf440..d5e8a9d 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "JSHTMLObjectElementCustom.h"
+#include "JSHTMLObjectElement.h"
 
 #include "HTMLObjectElement.h"
 #include "JSPluginElementFunctions.h"
diff --git a/Source/WebCore/bindings/js/JSHTMLObjectElementCustom.h b/Source/WebCore/bindings/js/JSHTMLObjectElementCustom.h
deleted file mode 100644 (file)
index 38659f9..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSHTMLObjectElementCustom_h
-#define JSHTMLObjectElementCustom_h
-
-#include "JSHTMLObjectElement.h"
-
-#endif // JSHTMLObjectElementCustom_h
index 1728a74..4b6df9f 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include "JSHistoryCustom.h"
+#include "JSHistory.h"
 
 #include "Frame.h"
 #include "History.h"
diff --git a/Source/WebCore/bindings/js/JSHistoryCustom.h b/Source/WebCore/bindings/js/JSHistoryCustom.h
deleted file mode 100644 (file)
index 40edc6f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSHistoryCustom_h
-#define JSHistoryCustom_h
-
-#include "JSHistory.h"
-
-#endif // JSHistoryCustom_h
-
-
index 0e81d67..eabbb15 100644 (file)
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "JSLocationCustom.h"
+#include "JSLocation.h"
 
 #include "Location.h"
 #include <runtime/JSFunction.h>
diff --git a/Source/WebCore/bindings/js/JSLocationCustom.h b/Source/WebCore/bindings/js/JSLocationCustom.h
deleted file mode 100644 (file)
index 127871e..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSLocationCustom_h
-#define JSLocationCustom_h
-
-#include "JSLocation.h"
-
-#endif // JSLocationCustom_h
-
-
index e4fe853..d8509c8 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "JSStorageCustom.h"
+#include "JSStorage.h"
 
 #include "Storage.h"
 #include <runtime/PropertyNameArray.h>
diff --git a/Source/WebCore/bindings/js/JSStorageCustom.h b/Source/WebCore/bindings/js/JSStorageCustom.h
deleted file mode 100644 (file)
index 45f62df..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef JSStorageCustom_h
-#define JSStorageCustom_h
-
-#include "JSStorage.h"
-
-#endif // JSStorageCustom_h
index 311a0d1..fb8b988 100644 (file)
@@ -781,8 +781,6 @@ sub GenerateHeader
 
     $headerTrailingIncludes{"${className}Custom.h"} = 1 if $interface->extendedAttributes->{"JSCustomHeader"};
 
-    $implIncludes{"${className}Custom.h"} = 1 if !$interface->extendedAttributes->{"JSCustomHeader"} && ($interface->extendedAttributes->{"CustomPutFunction"} || $interface->extendedAttributes->{"CustomNamedSetter"});
-
     my $namedGetterFunction = GetNamedGetterFunction($interface);
     my $indexedGetterFunction = GetIndexedGetterFunction($interface);
     my $hasNumericIndexedGetter = $indexedGetterFunction ? $codeGenerator->IsNumericType($indexedGetterFunction->signature->type) : 0;
index 589d798..f7992a9 100644 (file)
@@ -26,7 +26,6 @@
 
 #include "ExceptionCode.h"
 #include "JSDOMBinding.h"
-#include "JSTestInterfaceCustom.h"
 #include "JSTestObj.h"
 #include "TestInterface.h"
 #include "TestObj.h"