Changeset 156381 in webkit

Timestamp:

Sep 24, 2013, 8:09:41 PM (12 years ago)

Author:

Antti Koivisto

Message:

Remove HTMLContentElement
​https://bugs.webkit.org/show_bug.cgi?id=121891

Reviewed by Andreas Kling.

Remove an unsused Shadow DOM type.

• DerivedSources.make:
• WebCore.exp.in:
• WebCore.xcodeproj/project.pbxproj:
• html/HTMLDetailsElement.cpp:
• html/HTMLSummaryElement.cpp:
• html/HTMLTagNames.in:
• html/shadow/ContentDistributor.cpp:
• html/shadow/HTMLContentElement.cpp: Removed.
• html/shadow/HTMLContentElement.h: Removed.
• html/shadow/HTMLContentElement.idl: Removed.
• html/shadow/InsertionPoint.h:

(WebCore::InsertionPoint::matchTypeFor):

• testing/Internals.cpp:
• testing/Internals.h:
• testing/Internals.idl:

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• DerivedSources.cpp (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)
• DerivedSources.pri (modified) (1 diff)
• GNUmakefile.list.am (modified) (3 diffs)
• Target.pri (modified) (2 diffs)
• WebCore.exp.in (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj (modified) (4 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (11 diffs)
• html/HTMLDetailsElement.cpp (modified) (1 diff)
• html/HTMLElementsAllInOne.cpp (modified) (1 diff)
• html/HTMLSummaryElement.cpp (modified) (1 diff)
• html/HTMLTagNames.in (modified) (1 diff)
• html/shadow/ContentDistributor.cpp (modified) (1 diff)
• html/shadow/HTMLContentElement.cpp (deleted)
• html/shadow/HTMLContentElement.h (deleted)
• html/shadow/HTMLContentElement.idl (deleted)
• html/shadow/InsertionPoint.h (modified) (2 diffs)
• testing/Internals.cpp (modified) (2 diffs)
• testing/Internals.h (modified) (1 diff)
• testing/Internals.idl (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -539 +539 @@
     html/canvas/WebGLUniformLocation.idl
     html/canvas/WebGLVertexArrayObjectOES.idl
-
-    html/shadow/HTMLContentElement.idl
 
     inspector/InjectedScriptHost.idl
@@ -1560 +1558 @@
     html/shadow/ContentDistributor.cpp
     html/shadow/DetailsMarkerControl.cpp
-    html/shadow/HTMLContentElement.cpp
     html/shadow/InsertionPoint.cpp
     html/shadow/MediaControlElementTypes.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-24  Antti Koivisto  <antti@apple.com>
+
+        Remove HTMLContentElement
+        https://bugs.webkit.org/show_bug.cgi?id=121891
+
+        Reviewed by Andreas Kling.
+
+        Remove an unsused Shadow DOM type.
+
+        * DerivedSources.make:
+        * WebCore.exp.in:
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/HTMLDetailsElement.cpp:
+        * html/HTMLSummaryElement.cpp:
+        * html/HTMLTagNames.in:
+        * html/shadow/ContentDistributor.cpp:
+        * html/shadow/HTMLContentElement.cpp: Removed.
+        * html/shadow/HTMLContentElement.h: Removed.
+        * html/shadow/HTMLContentElement.idl: Removed.
+        * html/shadow/InsertionPoint.h:
+        (WebCore::InsertionPoint::matchTypeFor):
+        * testing/Internals.cpp:
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2013-09-24  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/DerivedSources.cpp

@@ -183 +183 @@
 #include "JSHTMLCanvasElement.cpp"
 #include "JSHTMLCollection.cpp"
-#include "JSHTMLContentElement.cpp"
 #include "JSHTMLDataListElement.cpp"
 #include "JSHTMLDetailsElement.cpp"

trunk/Source/WebCore/DerivedSources.make

@@ -449 +449 @@
     $(WebCore)/html/canvas/WebGLUniformLocation.idl \
     $(WebCore)/html/canvas/WebGLVertexArrayObjectOES.idl \
-    $(WebCore)/html/shadow/HTMLContentElement.idl \
     $(WebCore)/html/track/AudioTrack.idl \
     $(WebCore)/html/track/AudioTrackList.idl \

trunk/Source/WebCore/DerivedSources.pri

@@ -424 +424 @@
     $$PWD/html/ValidityState.idl \
     $$PWD/html/VoidCallback.idl \
-    $$PWD/html/shadow/HTMLContentElement.idl \
     $$PWD/inspector/InjectedScriptHost.idl \
     $$PWD/inspector/InspectorFrontendHost.idl \

trunk/Source/WebCore/GNUmakefile.list.am

@@ -326 +326 @@
         DerivedSources/WebCore/JSHTMLCollection.cpp \
         DerivedSources/WebCore/JSHTMLCollection.h \
-        DerivedSources/WebCore/JSHTMLContentElement.cpp \
-        DerivedSources/WebCore/JSHTMLContentElement.h \
         DerivedSources/WebCore/JSHTMLDataListElement.cpp \
         DerivedSources/WebCore/JSHTMLDataListElement.h \
@@ -1571 +1569 @@
         $(WebCore)/html/canvas/WebGLUniformLocation.idl \
         $(WebCore)/html/canvas/WebGLVertexArrayObjectOES.idl \
-        $(WebCore)/html/shadow/HTMLContentElement.idl \
         $(WebCore)/html/track/AudioTrack.idl \
         $(WebCore)/html/track/AudioTrackList.idl \
@@ -3701 +3698 @@
         Source/WebCore/html/shadow/DetailsMarkerControl.cpp \
         Source/WebCore/html/shadow/DetailsMarkerControl.h \
-        Source/WebCore/html/shadow/HTMLContentElement.cpp \
-        Source/WebCore/html/shadow/HTMLContentElement.h \
         Source/WebCore/html/shadow/InsertionPoint.cpp \
         Source/WebCore/html/shadow/InsertionPoint.h \

trunk/Source/WebCore/Target.pri

@@ -749 +749 @@
     html/shadow/ContentDistributor.cpp \
     html/shadow/DetailsMarkerControl.cpp \
-    html/shadow/HTMLContentElement.cpp \
     html/shadow/InsertionPoint.cpp \
     html/shadow/MediaControls.cpp \
@@ -1917 +1916 @@
     html/parser/XSSAuditorDelegate.h \
     html/shadow/ContentDistributor.h \
-    html/shadow/HTMLContentElement.h \
     html/shadow/MediaControlElementTypes.h \
     html/shadow/MediaControlElements.h \

trunk/Source/WebCore/WebCore.exp.in

@@ -2765 +2765 @@
 #endif
 
-#if ENABLE(SHADOW_DOM)
-__ZN7WebCore18HTMLContentElement6createEPNS_8DocumentE
-#endif
-
 #if ENABLE(CSS_REGIONS)
 __ZN7WebCore22RuntimeEnabledFeatures19isCSSRegionsEnabledE

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -2225 +2225 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLContentElement.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLDataListElement.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -15599 +15585 @@
     <ClCompile Include="..\html\shadow\ContentDistributor.cpp" />
     <ClCompile Include="..\html\shadow\DetailsMarkerControl.cpp" />
-    <ClCompile Include="..\html\shadow\HTMLContentElement.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\html\shadow\InsertionPoint.cpp" />
     <ClCompile Include="..\html\shadow\MediaControlElements.cpp" />
@@ -18332 +18304 @@
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLCanvasElement.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLCollection.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLContentElement.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLDataListElement.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLDetailsElement.h" />
@@ -20628 +20599 @@
     <ClInclude Include="..\html\shadow\ContentDistributor.h" />
     <ClInclude Include="..\html\shadow\DetailsMarkerControl.h" />
-    <ClInclude Include="..\html\shadow\HTMLContentElement.h" />
     <ClInclude Include="..\html\shadow\InsertionPoint.h" />
     <ClInclude Include="..\html\shadow\MediaControlElements.h" />

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1497 +1497 @@
                 4A0DA2FE129B241900AB61E1 /* FormAssociatedElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */; };
                 4A0DA2FF129B241900AB61E1 /* FormAssociatedElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A0DA2FD129B241900AB61E1 /* FormAssociatedElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                4A1E719014E101E400626F9D /* JSHTMLContentElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A1E718E14E101E400626F9D /* JSHTMLContentElement.cpp */; };
-                4A1E719114E101E400626F9D /* JSHTMLContentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A1E718F14E101E400626F9D /* JSHTMLContentElement.h */; };
                 4A1E71A614E106AC00626F9D /* JSShadowRoot.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A1E71A414E106AC00626F9D /* JSShadowRoot.h */; };
                 4A38BF5014FE1C0900612512 /* WebSocketDeflateFramer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A38BF4E14FE1C0900612512 /* WebSocketDeflateFramer.cpp */; };
@@ -1786 +1784 @@
                 57B791A314C6A62900F202D1 /* ContentDistributor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */; };
                 57B791A414C6A62900F202D1 /* ContentDistributor.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A014C6A62900F202D1 /* ContentDistributor.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                57B791A914C6A63300F202D1 /* HTMLContentElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B791A714C6A63300F202D1 /* HTMLContentElement.cpp */; };
-                57B791AA14C6A63300F202D1 /* HTMLContentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A814C6A63300F202D1 /* HTMLContentElement.h */; };
                 57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */; };
                 57CF497514EE36D700ECFF14 /* InsertionPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 57CF497314EE36D700ECFF14 /* InsertionPoint.h */; };
@@ -8085 +8081 @@
                 4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormAssociatedElement.cpp; sourceTree = "<group>"; };
                 4A0DA2FD129B241900AB61E1 /* FormAssociatedElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormAssociatedElement.h; sourceTree = "<group>"; };
-                4A1E718E14E101E400626F9D /* JSHTMLContentElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLContentElement.cpp; sourceTree = "<group>"; };
-                4A1E718F14E101E400626F9D /* JSHTMLContentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLContentElement.h; sourceTree = "<group>"; };
                 4A1E71A414E106AC00626F9D /* JSShadowRoot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSShadowRoot.h; sourceTree = "<group>"; };
                 4A38BF4E14FE1C0900612512 /* WebSocketDeflateFramer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketDeflateFramer.cpp; path = Modules/websockets/WebSocketDeflateFramer.cpp; sourceTree = "<group>"; };
@@ -8392 +8386 @@
                 57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentDistributor.cpp; sourceTree = "<group>"; };
                 57B791A014C6A62900F202D1 /* ContentDistributor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentDistributor.h; sourceTree = "<group>"; };
-                57B791A714C6A63300F202D1 /* HTMLContentElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLContentElement.cpp; sourceTree = "<group>"; };
-                57B791A814C6A63300F202D1 /* HTMLContentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLContentElement.h; sourceTree = "<group>"; };
                 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertionPoint.cpp; sourceTree = "<group>"; };
                 57CF497314EE36D700ECFF14 /* InsertionPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InsertionPoint.h; sourceTree = "<group>"; };
@@ -10269 +10261 @@
                 A7B6E69D0B291A9600D0529F /* DragData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragData.h; sourceTree = "<group>"; };
                 A7B7619F161EE526002083D3 /* StyleScopeResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleScopeResolver.h; sourceTree = "<group>"; };
-                A7B7749614CF6353004044BB /* HTMLContentElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLContentElement.idl; sourceTree = "<group>"; };
                 A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMeterElement.cpp; sourceTree = "<group>"; };
                 A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLMeterElement.h; sourceTree = "<group>"; };
@@ -14493 +14484 @@
                                 A7C9ABF61357A3BF00F5503F /* DetailsMarkerControl.cpp */,
                                 A7C9ABF71357A3BF00F5503F /* DetailsMarkerControl.h */,
-                                57B791A714C6A63300F202D1 /* HTMLContentElement.cpp */,
-                                57B791A814C6A63300F202D1 /* HTMLContentElement.h */,
-                                A7B7749614CF6353004044BB /* HTMLContentElement.idl */,
                                 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */,
                                 57CF497314EE36D700ECFF14 /* InsertionPoint.h */,
@@ -17295 +17283 @@
                                 BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */,
                                 BCCBAD3F0C18C14200CE890F /* JSHTMLCollection.h */,
-                                4A1E718E14E101E400626F9D /* JSHTMLContentElement.cpp */,
-                                4A1E718F14E101E400626F9D /* JSHTMLContentElement.h */,
                                 F5C041E10FFCA96D00839D4A /* JSHTMLDataListElement.cpp */,
                                 F5C041E20FFCA96D00839D4A /* JSHTMLDataListElement.h */,
@@ -22658 +22644 @@
                                 A8DF3FD0097FA0FC0052981B /* HTMLCollection.h in Headers */,
                                 977B3865122883E900B81FF8 /* HTMLConstructionSite.h in Headers */,
-                                57B791AA14C6A63300F202D1 /* HTMLContentElement.h in Headers */,
                                 E1A31663134BCAE8007C9A4F /* HTMLConverter.h in Headers */,
                                 F5C041DB0FFCA7CE00839D4A /* HTMLDataListElement.h in Headers */,
@@ -23075 +23060 @@
                                 938E666209F09B87008A48EC /* JSHTMLCanvasElement.h in Headers */,
                                 BCCBAD410C18C14200CE890F /* JSHTMLCollection.h in Headers */,
-                                4A1E719114E101E400626F9D /* JSHTMLContentElement.h in Headers */,
                                 076306D017E1478D005A7C4E /* MediaStreamTrackSourcesCallback.h in Headers */,
                                 F5C041E70FFCA96D00839D4A /* JSHTMLDataListElement.h in Headers */,
@@ -25919 +25903 @@
                                 A8DF3FD1097FA0FC0052981B /* HTMLCollection.cpp in Sources */,
                                 977B3864122883E900B81FF8 /* HTMLConstructionSite.cpp in Sources */,
-                                57B791A914C6A63300F202D1 /* HTMLContentElement.cpp in Sources */,
                                 5D4F51DF132725480016F541 /* HTMLConverter.mm in Sources */,
                                 F5C041DA0FFCA7CE00839D4A /* HTMLDataListElement.cpp in Sources */,
@@ -26326 +26309 @@
                                 BCCBAD3B0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp in Sources */,
                                 CD61FE841794CC59004101EB /* JSWebKitSourceBuffer.cpp in Sources */,
-                                4A1E719014E101E400626F9D /* JSHTMLContentElement.cpp in Sources */,
                                 F5C041E60FFCA96D00839D4A /* JSHTMLDataListElement.cpp in Sources */,
                                 D359D8BE129CA55C0006E5D2 /* JSHTMLDetailsElement.cpp in Sources */,

trunk/Source/WebCore/html/HTMLDetailsElement.cpp

@@ -23 +23 @@
 
 #if ENABLE(DETAILS_ELEMENT)
-#include "HTMLContentElement.h"
 #include "HTMLNames.h"
 #include "HTMLSummaryElement.h"
+#include "InsertionPoint.h"
 #include "LocalizedStrings.h"
 #include "MouseEvent.h"

trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp

@@ -45 +45 @@
 #include "HTMLButtonElement.cpp"
 #include "HTMLCanvasElement.cpp"
-#include "HTMLContentElement.cpp"
 #include "HTMLDataListElement.cpp"
 #include "HTMLDetailsElement.cpp"

trunk/Source/WebCore/html/HTMLSummaryElement.cpp

@@ -24 +24 @@
 #if ENABLE(DETAILS_ELEMENT)
 #include "DetailsMarkerControl.h"
-#include "HTMLContentElement.h"
 #include "HTMLDetailsElement.h"
 #include "HTMLNames.h"
+#include "InsertionPoint.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"

trunk/Source/WebCore/html/HTMLTagNames.in

@@ -32 +32 @@
 colgroup interfaceName=HTMLTableColElement
 command interfaceName=HTMLElement
-content interfaceName=HTMLContentElement, conditional=SHADOW_DOM, runtimeConditional=shadowDOM, generateTypeHelpers
 webkitShadowContent interfaceName=HTMLElement, noConstructor
 datalist interfaceName=HTMLDataListElement, conditional=DATALIST_ELEMENT

trunk/Source/WebCore/html/shadow/ContentDistributor.cpp

@@ -29 +29 @@
 
 #include "ElementTraversal.h"
-#include "HTMLContentElement.h"
+#include "InsertionPoint.h"
 #include "ShadowRoot.h"
-
 
 namespace WebCore {

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -42 +42 @@
 class InsertionPoint : public HTMLElement {
 public:
-    enum Type {
-        InternalType,
-        HTMLContentElementType
-    };
-
     enum MatchType {
         AlwaysMatches,
@@ -60 +55 @@
 
     virtual MatchType matchTypeFor(Node*) const { return AlwaysMatches; }
-    virtual Type insertionPointType() const { return InternalType; }
 
     virtual void willAttachRenderers() OVERRIDE;

trunk/Source/WebCore/testing/Internals.cpp

@@ -50 +50 @@
 #include "FrameLoader.h"
 #include "FrameView.h"
-#include "HTMLContentElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
@@ -347 +346 @@
 }
 
-PassRefPtr<Element> Internals::createContentElement(ExceptionCode& ec)
-{
-    Document* document = contextDocument();
-    if (!document) {
-        ec = INVALID_ACCESS_ERR;
-        return 0;
-    }
-
-#if ENABLE(SHADOW_DOM)
-    return HTMLContentElement::create(*document);
-#else
-    return 0;
-#endif
-}
-
-bool Internals::isValidContentSelect(Element* insertionPoint, ExceptionCode& ec)
-{
-    if (!insertionPoint || !insertionPoint->isInsertionPoint()) {
-        ec = INVALID_ACCESS_ERR;
-        return false;
-    }
-
-#if ENABLE(SHADOW_DOM)
-    return isHTMLContentElement(insertionPoint) && toHTMLContentElement(insertionPoint)->isSelectValid();
-#else
-    return false;
-#endif
-}
 
 Node* Internals::treeScopeRootNode(Node* node, ExceptionCode& ec)

trunk/Source/WebCore/testing/Internals.h

@@ -110 +110 @@
     bool pauseTransitionAtTimeOnPseudoElement(const String& property, double pauseTime, Element*, const String& pseudoId, ExceptionCode&);
 
-    PassRefPtr<Element> createContentElement(ExceptionCode&);
-    bool isValidContentSelect(Element* insertionPoint, ExceptionCode&);
     Node* treeScopeRootNode(Node*, ExceptionCode&);
     Node* parentTreeScope(Node*, ExceptionCode&);

trunk/Source/WebCore/testing/Internals.idl

@@ -50 +50 @@
     [RaisesException] DOMString shadowPseudoId(Element element);
     [RaisesException] void setShadowPseudoId(Element element, DOMString id);
-    [RaisesException] Element createContentElement();
-    [RaisesException] boolean isValidContentSelect(Element contentElement);
     [RaisesException] Node treeScopeRootNode(Node node);
     [RaisesException] Node parentTreeScope(Node node);