From f8dbe7f211cc4e36b5821c9a56c3848ec6379f2c Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Wed, 18 Jan 2012 09:15:24 +0000 Subject: [PATCH] Move ShadowContentElement from dom/ to html/ and make ShadowContentElement subclass of HTMLElement. https://bugs.webkit.org/show_bug.cgi?id=76241 Patch by Shinya Kawanaka on 2012-01-18 Reviewed by Dimitri Glazkov. .: * Source/autotools/symbols.filter: Exposed necessary symbols. Source/WebCore: Renamed ShadowContentElement to HTMLContentElement, and move it from dom/ to html/. Also, ShadowInclusionSelector and ShadowContentSelectorQuery are renamed to Content InclusionSelector and ContentSelectorQuery respectively. No new tests, because no change in behavior. * CMakeLists.txt: * GNUmakefile.list.am: * Target.pri: * WebCore.exp.in: * WebCore.gypi: * WebCore.vcproj/WebCore.vcproj: * WebCore.xcodeproj/project.pbxproj: * dom/DOMAllInOne.cpp: * dom/NodeRenderingContext.cpp: (WebCore::nextRendererOf): (WebCore::previousRendererOf): (WebCore::firstRendererOf): (WebCore::lastRendererOf): (WebCore::NodeRenderingContext::nextRenderer): (WebCore::NodeRenderingContext::previousRenderer): * dom/NodeRenderingContext.h: (WebCore::NodeRenderingContext::includer): * dom/ShadowRoot.cpp: (WebCore::ShadowRoot::includerFor): (WebCore::ShadowRoot::inclusions): (WebCore::ShadowRoot::ensureInclusions): * dom/ShadowRoot.h: * html/HTMLDetailsElement.cpp: (WebCore::DetailsContentElement::DetailsContentElement): (WebCore::DetailsSummaryElement::DetailsSummaryElement): * html/HTMLElementsAllInOne.cpp: * html/HTMLSummaryElement.cpp: (WebCore::SummaryContentElement::SummaryContentElement): * html/shadow/ContentInclusionSelector.cpp: Renamed from Source/WebCore/dom/ShadowInclusionSelector.cpp. (WebCore::ShadowInclusion::append): (WebCore::ShadowInclusion::unlink): (WebCore::ShadowInclusionList::ShadowInclusionList): (WebCore::ShadowInclusionList::~ShadowInclusionList): (WebCore::ShadowInclusionList::find): (WebCore::ShadowInclusionList::clear): (WebCore::ShadowInclusionList::append): (WebCore::ContentInclusionSelector::ContentInclusionSelector): (WebCore::ContentInclusionSelector::~ContentInclusionSelector): (WebCore::ContentInclusionSelector::select): (WebCore::ContentInclusionSelector::unselect): (WebCore::ContentInclusionSelector::findFor): (WebCore::ContentInclusionSelector::didSelect): (WebCore::ContentInclusionSelector::willSelectOver): * html/shadow/ContentInclusionSelector.h: Renamed from Source/WebCore/dom/ShadowInclusionSelector.h. (WebCore::ShadowInclusion::includer): (WebCore::ShadowInclusion::content): (WebCore::ShadowInclusion::next): (WebCore::ShadowInclusion::previous): (WebCore::ShadowInclusion::ShadowInclusion): (WebCore::ShadowInclusion::create): (WebCore::ShadowInclusionList::first): (WebCore::ShadowInclusionList::last): (WebCore::ShadowInclusionList::isEmpty): (WebCore::ShadowInclusionSet::add): (WebCore::ShadowInclusionSet::remove): (WebCore::ShadowInclusionSet::isEmpty): (WebCore::ShadowInclusionSet::Translator::hash): (WebCore::ShadowInclusionSet::Translator::equal): (WebCore::ShadowInclusionSet::Hash::hash): (WebCore::ShadowInclusionSet::Hash::equal): (WebCore::ShadowInclusionSet::find): (WebCore::ContentInclusionSelector::hasCandidates): * html/shadow/ContentSelectorQuery.cpp: Renamed from Source/WebCore/dom/ShadowContentSelectorQuery.cpp. (WebCore::ContentSelectorQuery::ContentSelectorQuery): (WebCore::ContentSelectorQuery::matches): * html/shadow/ContentSelectorQuery.h: Renamed from Source/WebCore/dom/ShadowContentSelectorQuery.h. * html/shadow/HTMLContentElement.cpp: Renamed from Source/WebCore/dom/ShadowContentElement.cpp. (WebCore::HTMLContentElement::create): (WebCore::HTMLContentElement::HTMLContentElement): (WebCore::HTMLContentElement::~HTMLContentElement): (WebCore::HTMLContentElement::attach): (WebCore::HTMLContentElement::detach): (WebCore::HTMLContentElement::select): (WebCore::HTMLContentElement::setSelect): * html/shadow/HTMLContentElement.h: Renamed from Source/WebCore/dom/ShadowContentElement.h. (WebCore::HTMLContentElement::inclusions): (WebCore::HTMLContentElement::isContentElement): (WebCore::HTMLContentElement::rendererIsNeeded): (WebCore::HTMLContentElement::createRenderer): (WebCore::toHTMLContentElement): * testing/Internals.cpp: (WebCore::Internals::createContentElement): * testing/Internals.h: * testing/Internals.idl: Source/WebKit2: * win/WebKit2.def: Exposed necessary symbols. * win/WebKit2CFLite.def: ditto. LayoutTests: Renamed internals.createShadowContentElement to internals.createContentElement. * fast/dom/shadow/content-element-includer.html: * fast/dom/shadow/content-element-renderers.html: * fast/dom/shadow/create-content-element.html: * fast/dom/shadow/shadow-contents-select.html: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105249 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 9 + LayoutTests/ChangeLog | 14 + .../fast/dom/shadow/content-element-includer.html | 4 +- .../fast/dom/shadow/content-element-renderers.html | 2 +- .../fast/dom/shadow/create-content-element.html | 2 +- .../fast/dom/shadow/shadow-contents-select.html | 2 +- Source/WebCore/CMakeLists.txt | 6 +- Source/WebCore/ChangeLog | 98 +++++++ Source/WebCore/GNUmakefile.list.am | 12 +- Source/WebCore/Target.pri | 12 +- Source/WebCore/WebCore.exp.in | 2 +- Source/WebCore/WebCore.gypi | 14 +- Source/WebCore/WebCore.vcproj/WebCore.vcproj | 296 +++++---------------- Source/WebCore/WebCore.xcodeproj/project.pbxproj | 76 ++++-- Source/WebCore/dom/DOMAllInOne.cpp | 3 - Source/WebCore/dom/NodeRenderingContext.cpp | 16 +- Source/WebCore/dom/NodeRenderingContext.h | 8 +- Source/WebCore/dom/ShadowRoot.cpp | 14 +- Source/WebCore/dom/ShadowRoot.h | 12 +- Source/WebCore/html/HTMLDetailsElement.cpp | 10 +- Source/WebCore/html/HTMLElementsAllInOne.cpp | 1 + Source/WebCore/html/HTMLSummaryElement.cpp | 6 +- .../shadow/ContentInclusionSelector.cpp} | 22 +- .../shadow/ContentInclusionSelector.h} | 28 +- .../shadow/ContentSelectorQuery.cpp} | 8 +- .../shadow/ContentSelectorQuery.h} | 14 +- .../shadow/HTMLContentElement.cpp} | 32 +-- .../shadow/HTMLContentElement.h} | 24 +- Source/WebCore/testing/Internals.cpp | 6 +- Source/WebCore/testing/Internals.h | 2 +- Source/WebCore/testing/Internals.idl | 2 +- Source/WebKit2/ChangeLog | 10 + Source/WebKit2/win/WebKit2.def | 2 +- Source/WebKit2/win/WebKit2CFLite.def | 2 +- Source/autotools/symbols.filter | 2 +- 35 files changed, 386 insertions(+), 387 deletions(-) rename Source/WebCore/{dom/ShadowInclusionSelector.cpp => html/shadow/ContentInclusionSelector.cpp} (85%) rename Source/WebCore/{dom/ShadowInclusionSelector.h => html/shadow/ContentInclusionSelector.h} (85%) rename Source/WebCore/{dom/ShadowContentSelectorQuery.cpp => html/shadow/ContentSelectorQuery.cpp} (91%) rename Source/WebCore/{dom/ShadowContentSelectorQuery.h => html/shadow/ContentSelectorQuery.h} (86%) rename Source/WebCore/{dom/ShadowContentElement.cpp => html/shadow/HTMLContentElement.cpp} (74%) rename Source/WebCore/{dom/ShadowContentElement.h => html/shadow/HTMLContentElement.h} (82%) diff --git a/ChangeLog b/ChangeLog index 856e949..0deff7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-01-18 Shinya Kawanaka + + Move ShadowContentElement from dom/ to html/ and make ShadowContentElement subclass of HTMLElement. + https://bugs.webkit.org/show_bug.cgi?id=76241 + + Reviewed by Dimitri Glazkov. + + * Source/autotools/symbols.filter: Exposed necessary symbols. + 2012-01-18 Carlos Garcia Campos Unreviewed. Fix GTK+ build after r105245. diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index dc1b966..8676d67 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,17 @@ +2012-01-18 Shinya Kawanaka + + Move ShadowContentElement from dom/ to html/ and make ShadowContentElement subclass of HTMLElement. + https://bugs.webkit.org/show_bug.cgi?id=76241 + + Reviewed by Dimitri Glazkov. + + Renamed internals.createShadowContentElement to internals.createContentElement. + + * fast/dom/shadow/content-element-includer.html: + * fast/dom/shadow/content-element-renderers.html: + * fast/dom/shadow/create-content-element.html: + * fast/dom/shadow/shadow-contents-select.html: + 2012-01-17 Nikolas Zimmermann RenderSVGRoot should inherit from RenderReplaced diff --git a/LayoutTests/fast/dom/shadow/content-element-includer.html b/LayoutTests/fast/dom/shadow/content-element-includer.html index f19bd17..fb6a5b1 100644 --- a/LayoutTests/fast/dom/shadow/content-element-includer.html +++ b/LayoutTests/fast/dom/shadow/content-element-includer.html @@ -33,7 +33,7 @@ shouldBe("internals.includerFor(childOfElementWithShadow)", "null"); var elementWithShadowContent = document.createElement("div"); container.appendChild(elementWithShadowContent); var shadowRootOfElementWithShadowContent = internals.ensureShadowRoot(elementWithShadowContent); -var shadowContentOfElementWithShadowContent = internals.createShadowContentElement(document); +var shadowContentOfElementWithShadowContent = internals.createContentElement(document); shadowRootOfElementWithShadowContent.appendChild(shadowContentOfElementWithShadowContent); var childOfElementWithShadowContent = document.createElement("span"); elementWithShadowContent.appendChild(childOfElementWithShadowContent); @@ -58,7 +58,7 @@ elementWithShadow.removeChild(movingChild); var anotherElementWithShadowContent = document.createElement("div"); container.appendChild(anotherElementWithShadowContent); var anotherShadowRootOfElementWithShadowContent = internals.ensureShadowRoot(anotherElementWithShadowContent); -var anotherShadowContentOfElementWithShadowContent = internals.createShadowContentElement(document); +var anotherShadowContentOfElementWithShadowContent = internals.createContentElement(document); anotherShadowRootOfElementWithShadowContent.appendChild(anotherShadowContentOfElementWithShadowContent); anotherElementWithShadowContent.appendChild(movingChild); diff --git a/LayoutTests/fast/dom/shadow/content-element-renderers.html b/LayoutTests/fast/dom/shadow/content-element-renderers.html index 91519b8..977b89c 100644 --- a/LayoutTests/fast/dom/shadow/content-element-renderers.html +++ b/LayoutTests/fast/dom/shadow/content-element-renderers.html @@ -62,7 +62,7 @@ function createTreeFrom(html) var contentPlaceholder = root.getElementsByTagName("CONTENT")[0]; if (contentPlaceholder) { var contentParent = contentPlaceholder.parentNode; - contentParent.replaceChild(window.internals.createShadowContentElement(document), contentPlaceholder); + contentParent.replaceChild(window.internals.createContentElement(document), contentPlaceholder); }; return root; diff --git a/LayoutTests/fast/dom/shadow/create-content-element.html b/LayoutTests/fast/dom/shadow/create-content-element.html index bdb6001..8321231 100644 --- a/LayoutTests/fast/dom/shadow/create-content-element.html +++ b/LayoutTests/fast/dom/shadow/create-content-element.html @@ -29,7 +29,7 @@ function setupTargetTree() var child0 = document.createElement("span"); child0.innerHTML = "Hello,"; root.appendChild(child0); - root.appendChild(window.internals.createShadowContentElement(document)); + root.appendChild(window.internals.createContentElement(document)); var child1 = document.createElement("span"); child1.innerHTML = "World."; root.appendChild(child1); diff --git a/LayoutTests/fast/dom/shadow/shadow-contents-select.html b/LayoutTests/fast/dom/shadow/shadow-contents-select.html index 3d81d45..2efb936 100644 --- a/LayoutTests/fast/dom/shadow/shadow-contents-select.html +++ b/LayoutTests/fast/dom/shadow/shadow-contents-select.html @@ -15,7 +15,7 @@ function appendShadow(target, select) { child0.innerHTML = "Hello,"; root.appendChild(child0); - var content = internals.createShadowContentElement(document); + var content = internals.createContentElement(document); content.setAttribute('select', select); root.appendChild(content); diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 9fecec9..ad1bbba 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -594,9 +594,6 @@ SET(WebCore_SOURCES dom/ScriptRunner.cpp dom/SecurityContext.cpp dom/SelectorQuery.cpp - dom/ShadowContentElement.cpp - dom/ShadowContentSelectorQuery.cpp - dom/ShadowInclusionSelector.cpp dom/ShadowRoot.cpp dom/SpaceSplitString.cpp dom/StaticHashSetNodeList.cpp @@ -862,7 +859,10 @@ SET(WebCore_SOURCES html/parser/TextViewSourceParser.cpp html/parser/XSSAuditor.cpp + html/shadow/ContentSelectorQuery.cpp + html/shadow/ContentInclusionSelector.cpp html/shadow/DetailsMarkerControl.cpp + html/shadow/HTMLContentElement.cpp html/shadow/MediaControls.cpp html/shadow/MediaControlRootElement.cpp html/shadow/MeterShadowElement.cpp diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index f0c156d..43bbd95 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,101 @@ +2012-01-18 Shinya Kawanaka + + Move ShadowContentElement from dom/ to html/ and make ShadowContentElement subclass of HTMLElement. + https://bugs.webkit.org/show_bug.cgi?id=76241 + + Reviewed by Dimitri Glazkov. + + Renamed ShadowContentElement to HTMLContentElement, and move it from dom/ to html/. + Also, ShadowInclusionSelector and ShadowContentSelectorQuery are renamed to + Content InclusionSelector and ContentSelectorQuery respectively. + + No new tests, because no change in behavior. + + * CMakeLists.txt: + * GNUmakefile.list.am: + * Target.pri: + * WebCore.exp.in: + * WebCore.gypi: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * dom/DOMAllInOne.cpp: + * dom/NodeRenderingContext.cpp: + (WebCore::nextRendererOf): + (WebCore::previousRendererOf): + (WebCore::firstRendererOf): + (WebCore::lastRendererOf): + (WebCore::NodeRenderingContext::nextRenderer): + (WebCore::NodeRenderingContext::previousRenderer): + * dom/NodeRenderingContext.h: + (WebCore::NodeRenderingContext::includer): + * dom/ShadowRoot.cpp: + (WebCore::ShadowRoot::includerFor): + (WebCore::ShadowRoot::inclusions): + (WebCore::ShadowRoot::ensureInclusions): + * dom/ShadowRoot.h: + * html/HTMLDetailsElement.cpp: + (WebCore::DetailsContentElement::DetailsContentElement): + (WebCore::DetailsSummaryElement::DetailsSummaryElement): + * html/HTMLElementsAllInOne.cpp: + * html/HTMLSummaryElement.cpp: + (WebCore::SummaryContentElement::SummaryContentElement): + * html/shadow/ContentInclusionSelector.cpp: Renamed from Source/WebCore/dom/ShadowInclusionSelector.cpp. + (WebCore::ShadowInclusion::append): + (WebCore::ShadowInclusion::unlink): + (WebCore::ShadowInclusionList::ShadowInclusionList): + (WebCore::ShadowInclusionList::~ShadowInclusionList): + (WebCore::ShadowInclusionList::find): + (WebCore::ShadowInclusionList::clear): + (WebCore::ShadowInclusionList::append): + (WebCore::ContentInclusionSelector::ContentInclusionSelector): + (WebCore::ContentInclusionSelector::~ContentInclusionSelector): + (WebCore::ContentInclusionSelector::select): + (WebCore::ContentInclusionSelector::unselect): + (WebCore::ContentInclusionSelector::findFor): + (WebCore::ContentInclusionSelector::didSelect): + (WebCore::ContentInclusionSelector::willSelectOver): + * html/shadow/ContentInclusionSelector.h: Renamed from Source/WebCore/dom/ShadowInclusionSelector.h. + (WebCore::ShadowInclusion::includer): + (WebCore::ShadowInclusion::content): + (WebCore::ShadowInclusion::next): + (WebCore::ShadowInclusion::previous): + (WebCore::ShadowInclusion::ShadowInclusion): + (WebCore::ShadowInclusion::create): + (WebCore::ShadowInclusionList::first): + (WebCore::ShadowInclusionList::last): + (WebCore::ShadowInclusionList::isEmpty): + (WebCore::ShadowInclusionSet::add): + (WebCore::ShadowInclusionSet::remove): + (WebCore::ShadowInclusionSet::isEmpty): + (WebCore::ShadowInclusionSet::Translator::hash): + (WebCore::ShadowInclusionSet::Translator::equal): + (WebCore::ShadowInclusionSet::Hash::hash): + (WebCore::ShadowInclusionSet::Hash::equal): + (WebCore::ShadowInclusionSet::find): + (WebCore::ContentInclusionSelector::hasCandidates): + * html/shadow/ContentSelectorQuery.cpp: Renamed from Source/WebCore/dom/ShadowContentSelectorQuery.cpp. + (WebCore::ContentSelectorQuery::ContentSelectorQuery): + (WebCore::ContentSelectorQuery::matches): + * html/shadow/ContentSelectorQuery.h: Renamed from Source/WebCore/dom/ShadowContentSelectorQuery.h. + * html/shadow/HTMLContentElement.cpp: Renamed from Source/WebCore/dom/ShadowContentElement.cpp. + (WebCore::HTMLContentElement::create): + (WebCore::HTMLContentElement::HTMLContentElement): + (WebCore::HTMLContentElement::~HTMLContentElement): + (WebCore::HTMLContentElement::attach): + (WebCore::HTMLContentElement::detach): + (WebCore::HTMLContentElement::select): + (WebCore::HTMLContentElement::setSelect): + * html/shadow/HTMLContentElement.h: Renamed from Source/WebCore/dom/ShadowContentElement.h. + (WebCore::HTMLContentElement::inclusions): + (WebCore::HTMLContentElement::isContentElement): + (WebCore::HTMLContentElement::rendererIsNeeded): + (WebCore::HTMLContentElement::createRenderer): + (WebCore::toHTMLContentElement): + * testing/Internals.cpp: + (WebCore::Internals::createContentElement): + * testing/Internals.h: + * testing/Internals.idl: + 2012-01-17 Nikolas Zimmermann RenderSVGRoot should inherit from RenderReplaced diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 841ef71..8eaea87 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -1647,12 +1647,6 @@ webcore_sources += \ Source/WebCore/dom/SecurityContext.h \ Source/WebCore/dom/SelectorQuery.cpp \ Source/WebCore/dom/SelectorQuery.h \ - Source/WebCore/dom/ShadowContentElement.cpp \ - Source/WebCore/dom/ShadowContentElement.h \ - Source/WebCore/dom/ShadowContentSelectorQuery.cpp \ - Source/WebCore/dom/ShadowContentSelectorQuery.h \ - Source/WebCore/dom/ShadowInclusionSelector.cpp \ - Source/WebCore/dom/ShadowInclusionSelector.h \ Source/WebCore/dom/ShadowRoot.cpp \ Source/WebCore/dom/ShadowRoot.h \ Source/WebCore/dom/SpaceSplitString.cpp \ @@ -2231,8 +2225,14 @@ webcore_sources += \ Source/WebCore/html/parser/TextViewSourceParser.h \ Source/WebCore/html/parser/XSSAuditor.cpp \ Source/WebCore/html/parser/XSSAuditor.h \ + Source/WebCore/html/shadow/ContentInclusionSelector.cpp \ + Source/WebCore/html/shadow/ContentInclusionSelector.h \ + Source/WebCore/html/shadow/ContentSelectorQuery.cpp \ + Source/WebCore/html/shadow/ContentSelectorQuery.h \ 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/MediaControls.cpp \ Source/WebCore/html/shadow/MediaControls.h \ Source/WebCore/html/shadow/MediaControlElements.cpp \ diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index 5785e01..4ae73ce 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -560,9 +560,6 @@ SOURCES += \ dom/ScriptRunner.cpp \ dom/SecurityContext.cpp \ dom/SelectorQuery.cpp \ - dom/ShadowContentElement.cpp \ - dom/ShadowContentSelectorQuery.cpp \ - dom/ShadowInclusionSelector.cpp \ dom/ShadowRoot.cpp \ dom/SpaceSplitString.cpp \ dom/StaticNodeList.cpp \ @@ -842,7 +839,10 @@ SOURCES += \ html/parser/TextDocumentParser.cpp \ html/parser/TextViewSourceParser.cpp \ html/parser/XSSAuditor.cpp \ + html/shadow/ContentSelectorQuery.cpp \ + html/shadow/ContentInclusionSelector.cpp \ html/shadow/DetailsMarkerControl.cpp \ + html/shadow/HTMLContentElement.cpp \ html/shadow/MediaControls.cpp \ html/shadow/MediaControlRootElement.cpp \ html/shadow/MeterShadowElement.cpp \ @@ -1661,9 +1661,6 @@ HEADERS += \ dom/ScriptElement.h \ dom/ScriptExecutionContext.h \ dom/SelectorQuery.h \ - dom/ShadowContentElement.h \ - dom/ShadowContentSelectorQuery.h \ - dom/ShadowInclusionSelector.h \ dom/ShadowRoot.h \ dom/SpaceSplitString.h \ dom/StaticNodeList.h \ @@ -1902,6 +1899,9 @@ HEADERS += \ html/parser/HTMLTreeBuilder.h \ html/parser/HTMLViewSourceParser.h \ html/parser/XSSAuditor.h \ + html/shadow/ContentSelectorQuery.h \ + html/shadow/ContentInclusionSelector.h \ + html/shadow/HTMLContentElement.h \ html/shadow/MediaControlElements.h \ html/shadow/DetailsMarkerControl.h \ html/track/TextTrackList.h \ diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in index 3ffded2..09bffa2 100644 --- a/Source/WebCore/WebCore.exp.in +++ b/Source/WebCore/WebCore.exp.in @@ -546,6 +546,7 @@ __ZN7WebCore17RegularExpressionC1ERKN3WTF6StringENS1_19TextCaseSensitivityE __ZN7WebCore17RegularExpressionD1Ev __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE __ZN7WebCore17openTemporaryFileERKN3WTF6StringERi +__ZN7WebCore18HTMLContentElement6createEPNS_8DocumentE __ZN7WebCore18PlatformStrategies26createLocalizationStrategyEv __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE __ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE @@ -603,7 +604,6 @@ __ZN7WebCore20ResourceResponseBase20setSuggestedFilenameERKN3WTF6StringE __ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx __ZN7WebCore20ResourceResponseBase6setURLERKNS_4KURLE __ZN7WebCore20ResourceResponseBaseC2Ev -__ZN7WebCore20ShadowContentElement6createEPNS_8DocumentE __ZN7WebCore20UserGestureIndicator7s_stateE __ZN7WebCore20UserGestureIndicatorC1ENS_26ProcessingUserGestureStateE __ZN7WebCore20UserGestureIndicatorD1Ev diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi index 6af3da1..ef833be 100644 --- a/Source/WebCore/WebCore.gypi +++ b/Source/WebCore/WebCore.gypi @@ -1046,8 +1046,6 @@ 'dom/ScriptExecutionContext.h', 'dom/ScriptRunner.h', 'dom/ShadowRoot.h', - 'dom/ShadowContentElement.h', - 'dom/ShadowContentSelectorQuery.h', 'dom/SpaceSplitString.h', 'dom/StyledElement.h', 'dom/Text.h', @@ -5463,12 +5461,6 @@ 'dom/SecurityContext.h', 'dom/SelectorQuery.cpp', 'dom/SelectorQuery.h', - 'dom/ShadowContentElement.cpp', - 'dom/ShadowContentElement.h', - 'dom/ShadowContentSelectorQuery.cpp', - 'dom/ShadowContentSelectorQuery.h', - 'dom/ShadowInclusionSelector.cpp', - 'dom/ShadowInclusionSelector.h', 'dom/ShadowRoot.cpp', 'dom/ShadowRoot.h', 'dom/SpaceSplitString.cpp', @@ -5903,8 +5895,14 @@ 'html/parser/TextViewSourceParser.h', 'html/parser/XSSAuditor.cpp', 'html/parser/XSSAuditor.h', + 'html/shadow/ContentSelectorQuery.cpp', + 'html/shadow/ContentSelectorQuery.h', + 'html/shadow/ContentInclusionSelector.cpp', + 'html/shadow/ContentInclusionSelector.h', 'html/shadow/DetailsMarkerControl.cpp', 'html/shadow/DetailsMarkerControl.h', + 'html/shadow/HTMLContentElement.cpp', + 'html/shadow/HTMLContentElement.h', 'html/shadow/MediaControls.cpp', 'html/shadow/MediaControls.h', 'html/shadow/MediaControlElements.cpp', diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index da28d23..8f223a3 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -50998,230 +50998,6 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -61105,6 +60897,62 @@ > + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index 72c3b53..8cc7bc5 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -1570,6 +1570,12 @@ 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; }; 570DBA8114B5804900DAEFA0 /* ShadowContentSelectorQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570DB7A814B5696A00DAEFA0 /* ShadowContentSelectorQuery.cpp */; }; 570DBA8214B5804B00DAEFA0 /* ShadowContentSelectorQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 570DB7A914B5696A00DAEFA0 /* ShadowContentSelectorQuery.h */; }; + 57B791A314C6A62900F202D1 /* ContentInclusionSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B7919F14C6A62900F202D1 /* ContentInclusionSelector.cpp */; }; + 57B791A414C6A62900F202D1 /* ContentInclusionSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A014C6A62900F202D1 /* ContentInclusionSelector.h */; }; + 57B791A514C6A62900F202D1 /* ContentSelectorQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B791A114C6A62900F202D1 /* ContentSelectorQuery.cpp */; }; + 57B791A614C6A62900F202D1 /* ContentSelectorQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A214C6A62900F202D1 /* ContentSelectorQuery.h */; }; + 57B791A914C6A63300F202D1 /* HTMLContentElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B791A714C6A63300F202D1 /* HTMLContentElement.cpp */; }; + 57B791AA14C6A63300F202D1 /* HTMLContentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A814C6A63300F202D1 /* HTMLContentElement.h */; }; 5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */; }; 5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */; }; 590E1B4911E4EF4B0069F784 /* DeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -8396,6 +8402,12 @@ 550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = ""; tabWidth = 8; usesTabs = 0; }; 570DB7A814B5696A00DAEFA0 /* ShadowContentSelectorQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowContentSelectorQuery.cpp; sourceTree = ""; }; 570DB7A914B5696A00DAEFA0 /* ShadowContentSelectorQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowContentSelectorQuery.h; sourceTree = ""; }; + 57B7919F14C6A62900F202D1 /* ContentInclusionSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentInclusionSelector.cpp; sourceTree = ""; }; + 57B791A014C6A62900F202D1 /* ContentInclusionSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentInclusionSelector.h; sourceTree = ""; }; + 57B791A114C6A62900F202D1 /* ContentSelectorQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentSelectorQuery.cpp; sourceTree = ""; }; + 57B791A214C6A62900F202D1 /* ContentSelectorQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentSelectorQuery.h; sourceTree = ""; }; + 57B791A714C6A63300F202D1 /* HTMLContentElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLContentElement.cpp; sourceTree = ""; }; + 57B791A814C6A63300F202D1 /* HTMLContentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLContentElement.h; sourceTree = ""; }; 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTreeViewer.cpp; sourceTree = ""; }; 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTreeViewer.h; sourceTree = ""; }; 590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceOrientation.h; sourceTree = ""; }; @@ -13722,9 +13734,6 @@ 1AE82EC90CAAE177002237AE /* storage */ = { isa = PBXGroup; children = ( - A8F4579D14BC13EC000CEA59 /* DOMWindowSQLDatabase.cpp */, - A8F4579E14BC13EC000CEA59 /* DOMWindowSQLDatabase.h */, - A8F4579F14BC13EC000CEA59 /* DOMWindowSQLDatabase.idl */, B5B5DC67119BB3D5002A8790 /* AbstractDatabase.cpp */, B5B5DC68119BB3D5002A8790 /* AbstractDatabase.h */, 514185ED0CD65F0400763C99 /* ChangeVersionWrapper.cpp */, @@ -13747,6 +13756,9 @@ 1AD51A130CB59CD300953D11 /* DatabaseTracker.cpp */, 1AD51A120CB59CD300953D11 /* DatabaseTracker.h */, 51FAFE330CECBF2D00BB3F24 /* DatabaseTrackerClient.h */, + A8F4579D14BC13EC000CEA59 /* DOMWindowSQLDatabase.cpp */, + A8F4579E14BC13EC000CEA59 /* DOMWindowSQLDatabase.h */, + A8F4579F14BC13EC000CEA59 /* DOMWindowSQLDatabase.idl */, C585A69811D4FB3D004C3E4B /* IDBAny.cpp */, C585A69911D4FB3D004C3E4B /* IDBAny.h */, C585A69A11D4FB3D004C3E4B /* IDBAny.idl */, @@ -14227,8 +14239,14 @@ 4150F9ED12B6E0990008C860 /* shadow */ = { isa = PBXGroup; children = ( + 57B7919F14C6A62900F202D1 /* ContentInclusionSelector.cpp */, + 57B791A014C6A62900F202D1 /* ContentInclusionSelector.h */, + 57B791A114C6A62900F202D1 /* ContentSelectorQuery.cpp */, + 57B791A214C6A62900F202D1 /* ContentSelectorQuery.h */, A7C9ABF61357A3BF00F5503F /* DetailsMarkerControl.cpp */, A7C9ABF71357A3BF00F5503F /* DetailsMarkerControl.h */, + 57B791A714C6A63300F202D1 /* HTMLContentElement.cpp */, + 57B791A814C6A63300F202D1 /* HTMLContentElement.h */, 417253A81354BBBC00360F2A /* MediaControlElements.cpp */, 417253A91354BBBC00360F2A /* MediaControlElements.h */, 4157AF7F12F1FB0400A8C6F5 /* MediaControlRootElement.cpp */, @@ -17054,13 +17072,13 @@ A75E8B7F0E1DE2B0007F2481 /* filters */ = { isa = PBXGroup; children = ( + 49ECEB5C1499790D00CDD3A4 /* arm */, + 50D405F7147D31F300D30BB5 /* CustomFilterMesh.cpp */, + 50D405F8147D31F300D30BB5 /* CustomFilterMesh.h */, 50ACE2CA14B5D79300446666 /* CustomFilterOperation.h */, 503D0CA714B5B08700F32F57 /* CustomFilterProgram.cpp */, 503D0CA814B5B08700F32F57 /* CustomFilterProgram.h */, 503D0CA914B5B08700F32F57 /* CustomFilterProgramClient.h */, - 49ECEB5C1499790D00CDD3A4 /* arm */, - 50D405F7147D31F300D30BB5 /* CustomFilterMesh.cpp */, - 50D405F8147D31F300D30BB5 /* CustomFilterMesh.h */, 50D4060F147D49DE00D30BB5 /* CustomFilterShader.cpp */, 50D40610147D49DE00D30BB5 /* CustomFilterShader.h */, A1E1154313015C3D0054AC8C /* DistantLightSource.cpp */, @@ -19245,7 +19263,6 @@ BC8C8FAA0DDCD2F200B592F4 /* style */ = { isa = PBXGroup; children = ( - 503D0CAD14B5B0BA00F32F57 /* StyleCustomFilterProgram.h */, BC5EB5E00E81BE8700B25965 /* BorderData.h */, BC5EB5DA0E81B7EA00B25965 /* BorderValue.h */, BC5EB5DE0E81B9AB00B25965 /* CollapsedBorderValue.h */, @@ -19280,6 +19297,7 @@ BCEF444C0E674628001C1287 /* StyleCachedImage.h */, 5038BE2D1472AD230095E0D1 /* StyleCachedShader.cpp */, 5038BE2E1472AD230095E0D1 /* StyleCachedShader.h */, + 503D0CAD14B5B0BA00F32F57 /* StyleCustomFilterProgram.h */, BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */, BC5EB8B60E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp */, BC5EB8B70E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h */, @@ -21139,8 +21157,10 @@ A818721C0977D3C0005826D9 /* ContainerNode.h in Headers */, E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */, BC5EB9810E82072500B25965 /* ContentData.h in Headers */, + 57B791A414C6A62900F202D1 /* ContentInclusionSelector.h in Headers */, 59102FBC14327D3B003C9D04 /* ContentSearchUtils.h in Headers */, 97C471DC12F925BD0086354B /* ContentSecurityPolicy.h in Headers */, + 57B791A614C6A62900F202D1 /* ContentSelectorQuery.h in Headers */, 41D015CA0F4B5C71004A662F /* ContentType.h in Headers */, 370D6EDB138454550044103E /* ContentTypeParser.h in Headers */, 93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */, @@ -21235,6 +21255,9 @@ BC2272AD0E82E8F300E7F975 /* CursorList.h in Headers */, 62CD325A1157E57C0063B0A7 /* CustomEvent.h in Headers */, 50D405FA147D31F300D30BB5 /* CustomFilterMesh.h in Headers */, + 50ACE2CB14B5D79300446666 /* CustomFilterOperation.h in Headers */, + 503D0CAB14B5B08700F32F57 /* CustomFilterProgram.h in Headers */, + 503D0CAC14B5B08700F32F57 /* CustomFilterProgramClient.h in Headers */, 50D40612147D49DE00D30BB5 /* CustomFilterShader.h in Headers */, A8CB413E0E8633FD0032C4F0 /* DashArray.h in Headers */, A80E6D0B0A1989CA007FB8C5 /* DashboardRegion.h in Headers */, @@ -21366,6 +21389,7 @@ 85E711970AC5D5350053270F /* DOMDOMImplementationInternal.h in Headers */, 9B3A8872145632F9003AE8F5 /* DOMDOMSettableTokenList.h in Headers */, 7694565B1214DB630007CBAE /* DOMDOMTokenList.h in Headers */, + 7AABA25A14BC613300AA9A11 /* DOMEditor.h in Headers */, 85ACA9C00A9B5FA500671E90 /* DOMElement.h in Headers */, 85E711980AC5D5350053270F /* DOMElementInternal.h in Headers */, E415F1690D9A165D0033CE97 /* DOMElementTimeControl.h in Headers */, @@ -21902,6 +21926,8 @@ 85C7F5E70AAFBAFB004014DD /* DOMWheelEvent.h in Headers */, 85989DD10ACC8BBD00A0BC51 /* DOMWheelEventInternal.h in Headers */, 1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */, + 97D2AD0414B823A60093DF32 /* DOMWindowProperty.h in Headers */, + A8F457A114BC1A94000CEA59 /* DOMWindowSQLDatabase.h in Headers */, F35AE5AC14925F5B004D5776 /* DOMWrapperVisitor.h in Headers */, BC53DA2E1143121E000D817E /* DOMWrapperWorld.h in Headers */, 1A1D13800A5325520064BF5F /* DOMXPath.h in Headers */, @@ -22083,6 +22109,7 @@ A853123D11D0471B00D4D077 /* FragmentScriptingPermission.h in Headers */, 65BF022F0974816300C43196 /* Frame.h in Headers */, A7B070D3130A409C00A3763C /* FrameActionScheduler.h in Headers */, + 974A862314B7ADBB003FDC76 /* FrameDestructionObserver.h in Headers */, 656D373C0ADBA5DE00A4554D /* FrameLoader.h in Headers */, 656D373E0ADBA5DE00A4554D /* FrameLoaderClient.h in Headers */, D000EBA311BDAFD400C47726 /* FrameLoaderStateMachine.h in Headers */, @@ -22156,6 +22183,7 @@ 93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */, 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 */, D359D78A129CA2710006E5D2 /* HTMLDetailsElement.h in Headers */, @@ -22347,6 +22375,7 @@ F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */, F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */, 7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */, + 7ACD88D414C08BD60084EDD2 /* InspectorIndexedDBAgent.h in Headers */, 20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */, 7AA51DD6148506A900AD2752 /* InspectorMemoryAgent.h in Headers */, 4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */, @@ -22854,6 +22883,7 @@ 49EECF0D105070C400099FAB /* JSUint16Array.h in Headers */, 49EECF0B105070C400099FAB /* JSUint32Array.h in Headers */, 49EECF09105070C400099FAB /* JSUint8Array.h in Headers */, + 91089D3214C33600005AFC49 /* JSUint8ClampedArray.h in Headers */, 15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */, FD82D7F813D4C8BD004E4372 /* JSWaveShaperNode.h in Headers */, A7D20F63107F406900A80392 /* JSWebGLActiveInfo.h in Headers */, @@ -23501,6 +23531,7 @@ BC5EB67B0E81D3BE00B25965 /* StyleBoxData.h in Headers */, BCEF444D0E674628001C1287 /* StyleCachedImage.h in Headers */, 5038BE301472AD230095E0D1 /* StyleCachedShader.h in Headers */, + 503D0CAE14B5B0BA00F32F57 /* StyleCustomFilterProgram.h in Headers */, BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */, A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */, BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */, @@ -23745,6 +23776,7 @@ 080E49261255F3BD00EFCA27 /* SVGTextLayoutEngineBaseline.h in Headers */, 080E49281255F3BD00EFCA27 /* SVGTextLayoutEngineSpacing.h in Headers */, 08F0BFC61255C53C00075185 /* SVGTextMetrics.h in Headers */, + 7117445914BC34EC00EE5FC8 /* SVGTextMetricsBuilder.h in Headers */, B2227ACE0D00BF220071B782 /* SVGTextPathElement.h in Headers */, B2227AD10D00BF220071B782 /* SVGTextPositioningElement.h in Headers */, 0854B0251255E4E600B9CDD0 /* SVGTextQuery.h in Headers */, @@ -24017,17 +24049,6 @@ E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */, 977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */, FD537353137B651800008DCE /* ZeroPole.h in Headers */, - 974A862314B7ADBB003FDC76 /* FrameDestructionObserver.h in Headers */, - 97D2AD0414B823A60093DF32 /* DOMWindowProperty.h in Headers */, - 7AABA25A14BC613300AA9A11 /* DOMEditor.h in Headers */, - A8F457A114BC1A94000CEA59 /* DOMWindowSQLDatabase.h in Headers */, - 7117445914BC34EC00EE5FC8 /* SVGTextMetricsBuilder.h in Headers */, - 503D0CAB14B5B08700F32F57 /* CustomFilterProgram.h in Headers */, - 503D0CAC14B5B08700F32F57 /* CustomFilterProgramClient.h in Headers */, - 503D0CAE14B5B0BA00F32F57 /* StyleCustomFilterProgram.h in Headers */, - 50ACE2CB14B5D79300446666 /* CustomFilterOperation.h in Headers */, - 7ACD88D414C08BD60084EDD2 /* InspectorIndexedDBAgent.h in Headers */, - 91089D3214C33600005AFC49 /* JSUint8ClampedArray.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -24538,8 +24559,10 @@ 41F0618F0F5F069800A07EAC /* ConsoleMessage.cpp in Sources */, A818721F0977D3C0005826D9 /* ContainerNode.cpp in Sources */, BC5EB9800E82072500B25965 /* ContentData.cpp in Sources */, + 57B791A314C6A62900F202D1 /* ContentInclusionSelector.cpp in Sources */, 59102FBB14327D3B003C9D04 /* ContentSearchUtils.cpp in Sources */, 97C471DB12F925BD0086354B /* ContentSecurityPolicy.cpp in Sources */, + 57B791A514C6A62900F202D1 /* ContentSelectorQuery.cpp in Sources */, 41D015CB0F4B5C71004A662F /* ContentType.cpp in Sources */, 370D6EDA138454550044103E /* ContentTypeParser.cpp in Sources */, 065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */, @@ -24623,6 +24646,7 @@ 93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */, 62CD32591157E57C0063B0A7 /* CustomEvent.cpp in Sources */, 50D405F9147D31F300D30BB5 /* CustomFilterMesh.cpp in Sources */, + 503D0CAA14B5B08700F32F57 /* CustomFilterProgram.cpp in Sources */, 50D40611147D49DE00D30BB5 /* CustomFilterShader.cpp in Sources */, 5196116A0CAC56570010A80C /* Database.cpp in Sources */, 51A45B570CAD7FD7000D2BE9 /* DatabaseAuthorizer.cpp in Sources */, @@ -24714,6 +24738,7 @@ 85CA975D0A962E5400690CCF /* DOMDocumentType.mm in Sources */, 8518DCEA0A9CC80D0091B7A6 /* DOMDOMImplementation.mm in Sources */, 7694565C1214DB630007CBAE /* DOMDOMTokenList.mm in Sources */, + 7AABA25914BC613300AA9A11 /* DOMEditor.cpp in Sources */, 85ACA9C10A9B5FA500671E90 /* DOMElement.mm in Sources */, 85CA96B90A9621A600690CCF /* DOMEntity.mm in Sources */, 85089CDE0A98C42800A275AA /* DOMEntityReference.mm in Sources */, @@ -24987,6 +25012,8 @@ 31C0FF4D0E4CEFDD007D6FE5 /* DOMWebKitTransitionEvent.mm in Sources */, 85C7F5E80AAFBAFB004014DD /* DOMWheelEvent.mm in Sources */, 1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */, + 97D2AD0314B823A60093DF32 /* DOMWindowProperty.cpp in Sources */, + A8F457A014BC1A88000CEA59 /* DOMWindowSQLDatabase.cpp in Sources */, BC53DA481143134D000D817E /* DOMWrapperWorld.cpp in Sources */, 1A1D13810A5325520064BF5F /* DOMXPath.mm in Sources */, 85E9E0A20AB3A0C700069CD0 /* DOMXPathExpression.mm in Sources */, @@ -25133,6 +25160,7 @@ 41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */, 65BF022E0974816300C43196 /* Frame.cpp in Sources */, A7B070D2130A409C00A3763C /* FrameActionScheduler.cpp in Sources */, + 974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */, 932E16090AF578340025F408 /* FrameLoader.cpp in Sources */, D000EBA211BDAFD400C47726 /* FrameLoaderStateMachine.cpp in Sources */, 65BF02450974819000C43196 /* FrameMac.mm in Sources */, @@ -25191,6 +25219,7 @@ 93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */, 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 */, D359D789129CA2710006E5D2 /* HTMLDetailsElement.cpp in Sources */, @@ -25365,6 +25394,7 @@ 4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */, F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */, 7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */, + 7ACD88D314C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp in Sources */, 20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */, 7AA51DD5148506A900AD2752 /* InspectorMemoryAgent.cpp in Sources */, 4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */, @@ -25978,6 +26008,8 @@ 49EECF7D10508D9C00099FAB /* JSUint32ArrayCustom.cpp in Sources */, 49EECF08105070C400099FAB /* JSUint8Array.cpp in Sources */, 49EECF7C10508D9C00099FAB /* JSUint8ArrayCustom.cpp in Sources */, + 91089D3314C33605005AFC49 /* JSUint8ClampedArray.cpp in Sources */, + 91A3905B14C0F61100F67901 /* JSUint8ClampedArrayCustom.cpp in Sources */, 15C77094100D3CA8005BA267 /* JSValidityState.cpp in Sources */, FD82D7F713D4C8BD004E4372 /* JSWaveShaperNode.cpp in Sources */, FD8E9BDF13D4CD2B0050DC72 /* JSWaveShaperNodeCustom.cpp in Sources */, @@ -26937,14 +26969,6 @@ E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */, 977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */, FD537352137B651800008DCE /* ZeroPole.cpp in Sources */, - 974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */, - 97D2AD0314B823A60093DF32 /* DOMWindowProperty.cpp in Sources */, - 7AABA25914BC613300AA9A11 /* DOMEditor.cpp in Sources */, - A8F457A014BC1A88000CEA59 /* DOMWindowSQLDatabase.cpp in Sources */, - 503D0CAA14B5B08700F32F57 /* CustomFilterProgram.cpp in Sources */, - 7ACD88D314C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp in Sources */, - 91A3905B14C0F61100F67901 /* JSUint8ClampedArrayCustom.cpp in Sources */, - 91089D3314C33605005AFC49 /* JSUint8ClampedArray.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Source/WebCore/dom/DOMAllInOne.cpp b/Source/WebCore/dom/DOMAllInOne.cpp index 55b6052..f2cb467 100644 --- a/Source/WebCore/dom/DOMAllInOne.cpp +++ b/Source/WebCore/dom/DOMAllInOne.cpp @@ -112,9 +112,6 @@ #include "ScriptableDocumentParser.cpp" #include "SecurityContext.cpp" #include "SelectorQuery.cpp" -#include "ShadowContentElement.cpp" -#include "ShadowContentSelectorQuery.cpp" -#include "ShadowInclusionSelector.cpp" #include "ShadowRoot.cpp" #include "SpaceSplitString.cpp" #include "StaticHashSetNodeList.cpp" diff --git a/Source/WebCore/dom/NodeRenderingContext.cpp b/Source/WebCore/dom/NodeRenderingContext.cpp index ef85f7d..226c0f4 100644 --- a/Source/WebCore/dom/NodeRenderingContext.cpp +++ b/Source/WebCore/dom/NodeRenderingContext.cpp @@ -27,13 +27,13 @@ #include "NodeRenderingContext.h" #include "ContainerNode.h" +#include "ContentInclusionSelector.h" +#include "HTMLContentElement.h" #include "Node.h" #include "RenderFlowThread.h" #include "RenderFullScreen.h" #include "RenderObject.h" #include "RenderView.h" -#include "ShadowContentElement.h" -#include "ShadowInclusionSelector.h" #include "ShadowRoot.h" #if ENABLE(SVG) @@ -111,7 +111,7 @@ PassRefPtr NodeRenderingContext::releaseStyle() return m_style.release(); } -static RenderObject* nextRendererOf(ShadowContentElement* parent, Node* current) +static RenderObject* nextRendererOf(HTMLContentElement* parent, Node* current) { ShadowInclusion* currentInclusion = parent->inclusions()->find(current); if (!currentInclusion) @@ -125,7 +125,7 @@ static RenderObject* nextRendererOf(ShadowContentElement* parent, Node* current) return 0; } -static RenderObject* previousRendererOf(ShadowContentElement* parent, Node* current) +static RenderObject* previousRendererOf(HTMLContentElement* parent, Node* current) { RenderObject* lastRenderer = 0; @@ -139,7 +139,7 @@ static RenderObject* previousRendererOf(ShadowContentElement* parent, Node* curr return lastRenderer; } -static RenderObject* firstRendererOf(ShadowContentElement* parent) +static RenderObject* firstRendererOf(HTMLContentElement* parent) { for (ShadowInclusion* inclusion = parent->inclusions()->first(); inclusion; inclusion = inclusion->next()) { if (RenderObject* renderer = inclusion->content()->renderer()) @@ -149,7 +149,7 @@ static RenderObject* firstRendererOf(ShadowContentElement* parent) return 0; } -static RenderObject* lastRendererOf(ShadowContentElement* parent) +static RenderObject* lastRendererOf(HTMLContentElement* parent) { for (ShadowInclusion* inclusion = parent->inclusions()->last(); inclusion; inclusion = inclusion->previous()) { if (RenderObject* renderer = inclusion->content()->renderer()) @@ -187,7 +187,7 @@ RenderObject* NodeRenderingContext::nextRenderer() const return node->renderer(); } if (node->isContentElement()) { - if (RenderObject* first = firstRendererOf(toShadowContentElement(node))) + if (RenderObject* first = firstRendererOf(toHTMLContentElement(node))) return first; } } @@ -220,7 +220,7 @@ RenderObject* NodeRenderingContext::previousRenderer() const return node->renderer(); } if (node->isContentElement()) { - if (RenderObject* last = lastRendererOf(toShadowContentElement(node))) + if (RenderObject* last = lastRendererOf(toHTMLContentElement(node))) return last; } } diff --git a/Source/WebCore/dom/NodeRenderingContext.h b/Source/WebCore/dom/NodeRenderingContext.h index b4e8912..d314117 100644 --- a/Source/WebCore/dom/NodeRenderingContext.h +++ b/Source/WebCore/dom/NodeRenderingContext.h @@ -38,7 +38,7 @@ class Node; class RenderFlowThread; class RenderObject; class RenderStyle; -class ShadowContentElement; +class HTMLContentElement; class ShadowRoot; class NodeRenderingContext { @@ -52,7 +52,7 @@ public: RenderObject* parentRenderer() const; RenderObject* nextRenderer() const; RenderObject* previousRenderer() const; - ShadowContentElement* includer() const; + HTMLContentElement* includer() const; RenderStyle* style() const; void setStyle(PassRefPtr); @@ -86,7 +86,7 @@ private: Node* m_node; ContainerNode* m_parentNodeForRenderingAndStyle; ShadowRoot* m_visualParentShadowRoot; - ShadowContentElement* m_includer; + HTMLContentElement* m_includer; RefPtr m_style; RenderFlowThread* m_parentFlowRenderer; AtomicString m_flowThread; @@ -108,7 +108,7 @@ inline RenderStyle* NodeRenderingContext::style() const return m_style.get(); } -inline ShadowContentElement* NodeRenderingContext::includer() const +inline HTMLContentElement* NodeRenderingContext::includer() const { return m_includer; } diff --git a/Source/WebCore/dom/ShadowRoot.cpp b/Source/WebCore/dom/ShadowRoot.cpp index e2ce9b0..229d558 100644 --- a/Source/WebCore/dom/ShadowRoot.cpp +++ b/Source/WebCore/dom/ShadowRoot.cpp @@ -26,12 +26,12 @@ #include "config.h" #include "ShadowRoot.h" -#include "Element.h" +#include "ContentInclusionSelector.h" #include "Document.h" +#include "Element.h" +#include "HTMLContentElement.h" #include "NodeRareData.h" -#include "ShadowContentElement.h" -#include "ShadowInclusionSelector.h" #include "Text.h" namespace WebCore { @@ -101,7 +101,7 @@ void ShadowRoot::recalcShadowTreeStyle(StyleChange change) clearChildNeedsStyleRecalc(); } -ShadowContentElement* ShadowRoot::includerFor(Node* node) const +HTMLContentElement* ShadowRoot::includerFor(Node* node) const { if (!m_inclusions) return 0; @@ -155,15 +155,15 @@ void ShadowRoot::attach() m_inclusions->didSelect(); } -ShadowInclusionSelector* ShadowRoot::inclusions() const +ContentInclusionSelector* ShadowRoot::inclusions() const { return m_inclusions.get(); } -ShadowInclusionSelector* ShadowRoot::ensureInclusions() +ContentInclusionSelector* ShadowRoot::ensureInclusions() { if (!m_inclusions) - m_inclusions = adoptPtr(new ShadowInclusionSelector()); + m_inclusions = adoptPtr(new ContentInclusionSelector()); m_inclusions->willSelectOver(this); return m_inclusions.get(); } diff --git a/Source/WebCore/dom/ShadowRoot.h b/Source/WebCore/dom/ShadowRoot.h index 34ddf33..c5bc0db 100644 --- a/Source/WebCore/dom/ShadowRoot.h +++ b/Source/WebCore/dom/ShadowRoot.h @@ -32,8 +32,8 @@ namespace WebCore { class Document; -class ShadowContentElement; -class ShadowInclusionSelector; +class HTMLContentElement; +class ContentInclusionSelector; class ShadowRoot : public TreeScope { public: @@ -41,7 +41,7 @@ public: void recalcShadowTreeStyle(StyleChange); - ShadowContentElement* includerFor(Node*) const; + HTMLContentElement* includerFor(Node*) const; void hostChildrenChanged(); bool isInclusionSelectorActive() const; @@ -50,8 +50,8 @@ public: virtual bool applyAuthorSheets() const; void setApplyAuthorSheets(bool); - ShadowInclusionSelector* inclusions() const; - ShadowInclusionSelector* ensureInclusions(); + ContentInclusionSelector* inclusions() const; + ContentInclusionSelector* ensureInclusions(); private: ShadowRoot(Document*); @@ -65,7 +65,7 @@ private: bool hasContentElement() const; bool m_applyAuthorSheets; - OwnPtr m_inclusions; + OwnPtr m_inclusions; }; inline PassRefPtr ShadowRoot::create(Document* document) diff --git a/Source/WebCore/html/HTMLDetailsElement.cpp b/Source/WebCore/html/HTMLDetailsElement.cpp index aaa05e1..ddec738 100644 --- a/Source/WebCore/html/HTMLDetailsElement.cpp +++ b/Source/WebCore/html/HTMLDetailsElement.cpp @@ -23,12 +23,12 @@ #if ENABLE(DETAILS) +#include "HTMLContentElement.h" #include "HTMLNames.h" #include "HTMLSummaryElement.h" #include "LocalizedStrings.h" #include "MouseEvent.h" #include "RenderDetails.h" -#include "ShadowContentElement.h" #include "ShadowRoot.h" #include "Text.h" @@ -42,13 +42,13 @@ static const AtomicString& summaryQuerySelector() return selector; }; -class DetailsContentElement : public ShadowContentElement { +class DetailsContentElement : public HTMLContentElement { public: static PassRefPtr create(Document*); private: DetailsContentElement(Document* document) - : ShadowContentElement(HTMLNames::divTag, document) + : HTMLContentElement(HTMLNames::divTag, document) { } }; @@ -58,13 +58,13 @@ PassRefPtr DetailsContentElement::create(Document* docume return adoptRef(new DetailsContentElement(document)); } -class DetailsSummaryElement : public ShadowContentElement { +class DetailsSummaryElement : public HTMLContentElement { public: static PassRefPtr create(Document*); private: DetailsSummaryElement(Document* document) - : ShadowContentElement(HTMLNames::divTag, document) + : HTMLContentElement(HTMLNames::divTag, document) { setSelect(summaryQuerySelector()); } diff --git a/Source/WebCore/html/HTMLElementsAllInOne.cpp b/Source/WebCore/html/HTMLElementsAllInOne.cpp index b624e62..274a186 100644 --- a/Source/WebCore/html/HTMLElementsAllInOne.cpp +++ b/Source/WebCore/html/HTMLElementsAllInOne.cpp @@ -41,6 +41,7 @@ #include "HTMLBodyElement.cpp" #include "HTMLButtonElement.cpp" #include "HTMLCanvasElement.cpp" +#include "HTMLContentElement.cpp" #include "HTMLDataListElement.cpp" #include "HTMLDetailsElement.cpp" #include "HTMLDListElement.cpp" diff --git a/Source/WebCore/html/HTMLSummaryElement.cpp b/Source/WebCore/html/HTMLSummaryElement.cpp index ecf1085..9925627 100644 --- a/Source/WebCore/html/HTMLSummaryElement.cpp +++ b/Source/WebCore/html/HTMLSummaryElement.cpp @@ -24,12 +24,12 @@ #if ENABLE(DETAILS) #include "DetailsMarkerControl.h" +#include "HTMLContentElement.h" #include "HTMLDetailsElement.h" #include "HTMLNames.h" #include "MouseEvent.h" #include "PlatformMouseEvent.h" #include "RenderSummary.h" -#include "ShadowContentElement.h" #include "ShadowRoot.h" @@ -37,13 +37,13 @@ namespace WebCore { using namespace HTMLNames; -class SummaryContentElement : public ShadowContentElement { +class SummaryContentElement : public HTMLContentElement { public: static PassRefPtr create(Document*); private: SummaryContentElement(Document* document) - : ShadowContentElement(HTMLNames::divTag, document) + : HTMLContentElement(HTMLNames::divTag, document) { } }; diff --git a/Source/WebCore/dom/ShadowInclusionSelector.cpp b/Source/WebCore/html/shadow/ContentInclusionSelector.cpp similarity index 85% rename from Source/WebCore/dom/ShadowInclusionSelector.cpp rename to Source/WebCore/html/shadow/ContentInclusionSelector.cpp index 57e9d42..6b541a5 100644 --- a/Source/WebCore/dom/ShadowInclusionSelector.cpp +++ b/Source/WebCore/html/shadow/ContentInclusionSelector.cpp @@ -25,10 +25,10 @@ */ #include "config.h" -#include "ShadowInclusionSelector.h" +#include "ContentInclusionSelector.h" -#include "ShadowContentElement.h" -#include "ShadowContentSelectorQuery.h" +#include "ContentSelectorQuery.h" +#include "HTMLContentElement.h" #include "ShadowRoot.h" @@ -99,20 +99,20 @@ void ShadowInclusionList::append(PassRefPtr child) m_last = m_last->next(); } -ShadowInclusionSelector::ShadowInclusionSelector() +ContentInclusionSelector::ContentInclusionSelector() { } -ShadowInclusionSelector::~ShadowInclusionSelector() +ContentInclusionSelector::~ContentInclusionSelector() { ASSERT(m_candidates.isEmpty()); } -void ShadowInclusionSelector::select(ShadowContentElement* contentElement, ShadowInclusionList* inclusions) +void ContentInclusionSelector::select(HTMLContentElement* contentElement, ShadowInclusionList* inclusions) { ASSERT(inclusions->isEmpty()); - ShadowContentSelectorQuery query(contentElement); + ContentSelectorQuery query(contentElement); for (size_t i = 0; i < m_candidates.size(); ++i) { Node* child = m_candidates[i].get(); if (!child) @@ -127,24 +127,24 @@ void ShadowInclusionSelector::select(ShadowContentElement* contentElement, Shado } } -void ShadowInclusionSelector::unselect(ShadowInclusionList* list) +void ContentInclusionSelector::unselect(ShadowInclusionList* list) { for (ShadowInclusion* inclusion = list->first(); inclusion; inclusion = inclusion->next()) m_inclusionSet.remove(inclusion); list->clear(); } -ShadowInclusion* ShadowInclusionSelector::findFor(Node* key) const +ShadowInclusion* ContentInclusionSelector::findFor(Node* key) const { return m_inclusionSet.find(key); } -void ShadowInclusionSelector::didSelect() +void ContentInclusionSelector::didSelect() { m_candidates.clear(); } -void ShadowInclusionSelector::willSelectOver(ShadowRoot* scope) +void ContentInclusionSelector::willSelectOver(ShadowRoot* scope) { if (!m_candidates.isEmpty()) return; diff --git a/Source/WebCore/dom/ShadowInclusionSelector.h b/Source/WebCore/html/shadow/ContentInclusionSelector.h similarity index 85% rename from Source/WebCore/dom/ShadowInclusionSelector.h rename to Source/WebCore/html/shadow/ContentInclusionSelector.h index d1a8717..0f0b197 100644 --- a/Source/WebCore/dom/ShadowInclusionSelector.h +++ b/Source/WebCore/html/shadow/ContentInclusionSelector.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ShadowInclusionSelector_h -#define ShadowInclusionSelector_h +#ifndef ContentInclusionSelector_h +#define ContentInclusionSelector_h #include #include @@ -39,15 +39,15 @@ namespace WebCore { class Element; +class HTMLContentElement; class Node; class ShadowRoot; -class ShadowContentElement; class ShadowInclusion : public RefCounted { public: - static PassRefPtr create(ShadowContentElement*, Node*); + static PassRefPtr create(HTMLContentElement*, Node*); - ShadowContentElement* includer() const { return m_includer; } + HTMLContentElement* includer() const { return m_includer; } Node* content() const { return m_content.get(); } ShadowInclusion* next() const { return m_next.get(); } ShadowInclusion* previous() const { return m_previous.get(); } @@ -56,19 +56,19 @@ public: void unlink(); private: - ShadowInclusion(ShadowContentElement*, Node*); + ShadowInclusion(HTMLContentElement*, Node*); - ShadowContentElement* m_includer; + HTMLContentElement* m_includer; RefPtr m_content; RefPtr m_next; RefPtr m_previous; }; -inline ShadowInclusion::ShadowInclusion(ShadowContentElement* includer, Node* content) +inline ShadowInclusion::ShadowInclusion(HTMLContentElement* includer, Node* content) : m_includer(includer), m_content(content) { } -inline PassRefPtr ShadowInclusion::create(ShadowContentElement* includer, Node* content) +inline PassRefPtr ShadowInclusion::create(HTMLContentElement* includer, Node* content) { return adoptRef(new ShadowInclusion(includer, content)); } @@ -123,13 +123,13 @@ inline ShadowInclusion* ShadowInclusionSet::find(Node* key) const return found != m_set.end() ? *found : 0; } -class ShadowInclusionSelector { - WTF_MAKE_NONCOPYABLE(ShadowInclusionSelector); +class ContentInclusionSelector { + WTF_MAKE_NONCOPYABLE(ContentInclusionSelector); public: - ShadowInclusionSelector(); - ~ShadowInclusionSelector(); + ContentInclusionSelector(); + ~ContentInclusionSelector(); - void select(ShadowContentElement*, ShadowInclusionList*); + void select(HTMLContentElement*, ShadowInclusionList*); void unselect(ShadowInclusionList*); ShadowInclusion* findFor(Node* key) const; diff --git a/Source/WebCore/dom/ShadowContentSelectorQuery.cpp b/Source/WebCore/html/shadow/ContentSelectorQuery.cpp similarity index 91% rename from Source/WebCore/dom/ShadowContentSelectorQuery.cpp rename to Source/WebCore/html/shadow/ContentSelectorQuery.cpp index 1a061e7..2bf8e51 100644 --- a/Source/WebCore/dom/ShadowContentSelectorQuery.cpp +++ b/Source/WebCore/html/shadow/ContentSelectorQuery.cpp @@ -25,15 +25,15 @@ */ #include "config.h" -#include "ShadowContentSelectorQuery.h" +#include "ContentSelectorQuery.h" #include "CSSParser.h" #include "CSSSelectorList.h" -#include "ShadowContentElement.h" +#include "HTMLContentElement.h" namespace WebCore { -ShadowContentSelectorQuery::ShadowContentSelectorQuery(ShadowContentElement* element) +ContentSelectorQuery::ContentSelectorQuery(HTMLContentElement* element) : m_contentElement(element) , m_selectorChecker(element->document(), !element->document()->inQuirksMode()) { @@ -48,7 +48,7 @@ ShadowContentSelectorQuery::ShadowContentSelectorQuery(ShadowContentElement* ele m_selectors.initialize(m_selectorList); } -bool ShadowContentSelectorQuery::matches(Node* node) const +bool ContentSelectorQuery::matches(Node* node) const { ASSERT(node); if (!node) diff --git a/Source/WebCore/dom/ShadowContentSelectorQuery.h b/Source/WebCore/html/shadow/ContentSelectorQuery.h similarity index 86% rename from Source/WebCore/dom/ShadowContentSelectorQuery.h rename to Source/WebCore/html/shadow/ContentSelectorQuery.h index d56873b..bdafb99 100644 --- a/Source/WebCore/dom/ShadowContentSelectorQuery.h +++ b/Source/WebCore/html/shadow/ContentSelectorQuery.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ShadowContentSelectorQuery_h -#define ShadowContentSelectorQuery_h +#ifndef ContentSelectorQuery_h +#define ContentSelectorQuery_h #include "CSSSelectorList.h" #include "SelectorChecker.h" @@ -41,17 +41,17 @@ namespace WebCore { class Document; class Node; -class ShadowContentElement; +class HTMLContentElement; -class ShadowContentSelectorQuery { - WTF_MAKE_NONCOPYABLE(ShadowContentSelectorQuery); +class ContentSelectorQuery { + WTF_MAKE_NONCOPYABLE(ContentSelectorQuery); public: - explicit ShadowContentSelectorQuery(ShadowContentElement*); + explicit ContentSelectorQuery(HTMLContentElement*); bool matches(Node*) const; private: - ShadowContentElement* m_contentElement; + HTMLContentElement* m_contentElement; SelectorDataList m_selectors; CSSSelectorList m_selectorList; SelectorChecker m_selectorChecker; diff --git a/Source/WebCore/dom/ShadowContentElement.cpp b/Source/WebCore/html/shadow/HTMLContentElement.cpp similarity index 74% rename from Source/WebCore/dom/ShadowContentElement.cpp rename to Source/WebCore/html/shadow/HTMLContentElement.cpp index 63bcf01..1c14fec 100644 --- a/Source/WebCore/dom/ShadowContentElement.cpp +++ b/Source/WebCore/html/shadow/HTMLContentElement.cpp @@ -25,12 +25,12 @@ */ #include "config.h" -#include "ShadowContentElement.h" +#include "HTMLContentElement.h" +#include "ContentInclusionSelector.h" +#include "ContentSelectorQuery.h" #include "HTMLNames.h" #include "QualifiedName.h" -#include "ShadowContentSelectorQuery.h" -#include "ShadowInclusionSelector.h" #include "ShadowRoot.h" #include @@ -38,29 +38,29 @@ namespace WebCore { using HTMLNames::selectAttr; -PassRefPtr ShadowContentElement::create(Document* document) +PassRefPtr HTMLContentElement::create(Document* document) { DEFINE_STATIC_LOCAL(QualifiedName, tagName, (nullAtom, "webkitShadowContent", HTMLNames::divTag.namespaceURI())); - return adoptRef(new ShadowContentElement(tagName, document)); + return adoptRef(new HTMLContentElement(tagName, document)); } -ShadowContentElement::ShadowContentElement(const QualifiedName& name, Document* document) - : StyledElement(name, document, CreateHTMLElement) +HTMLContentElement::HTMLContentElement(const QualifiedName& name, Document* document) + : HTMLElement(name, document) , m_inclusions(adoptPtr(new ShadowInclusionList())) { } -ShadowContentElement::~ShadowContentElement() +HTMLContentElement::~HTMLContentElement() { } -void ShadowContentElement::attach() +void HTMLContentElement::attach() { ASSERT(!firstChild()); // Currently doesn't support any light child. - StyledElement::attach(); + HTMLElement::attach(); if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) { - ShadowInclusionSelector* selector = root->ensureInclusions(); + ContentInclusionSelector* selector = root->ensureInclusions(); selector->unselect(m_inclusions.get()); selector->select(this, m_inclusions.get()); for (ShadowInclusion* inclusion = m_inclusions->first(); inclusion; inclusion = inclusion->next()) @@ -70,23 +70,23 @@ void ShadowContentElement::attach() } } -void ShadowContentElement::detach() +void HTMLContentElement::detach() { if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) { - if (ShadowInclusionSelector* selector = root->inclusions()) + if (ContentInclusionSelector* selector = root->inclusions()) selector->unselect(m_inclusions.get()); } ASSERT(m_inclusions->isEmpty()); - StyledElement::detach(); + HTMLElement::detach(); } -const AtomicString& ShadowContentElement::select() const +const AtomicString& HTMLContentElement::select() const { return getAttribute(selectAttr); } -void ShadowContentElement::setSelect(const AtomicString& selectValue) +void HTMLContentElement::setSelect(const AtomicString& selectValue) { setAttribute(selectAttr, selectValue); } diff --git a/Source/WebCore/dom/ShadowContentElement.h b/Source/WebCore/html/shadow/HTMLContentElement.h similarity index 82% rename from Source/WebCore/dom/ShadowContentElement.h rename to Source/WebCore/html/shadow/HTMLContentElement.h index ace47ad..337772b 100644 --- a/Source/WebCore/dom/ShadowContentElement.h +++ b/Source/WebCore/html/shadow/HTMLContentElement.h @@ -28,24 +28,24 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ShadowContentElement_h -#define ShadowContentElement_h +#ifndef HTMLContentElement_h +#define HTMLContentElement_h -#include "StyledElement.h" +#include "HTMLElement.h" #include namespace WebCore { -class ShadowContentSelectorQuery; +class ContentSelectorQuery; class ShadowInclusionList; -// NOTE: Current implementation doesn't support dynamic insertion/deletion of ShadowContentElement. -// You should create ShadowContentElement during the host construction. -class ShadowContentElement : public StyledElement { +// NOTE: Current implementation doesn't support dynamic insertion/deletion of HTMLContentElement. +// You should create HTMLContentElement during the host construction. +class HTMLContentElement : public HTMLElement { public: - static PassRefPtr create(Document*); + static PassRefPtr create(Document*); - virtual ~ShadowContentElement(); + virtual ~HTMLContentElement(); virtual void attach(); virtual void detach(); @@ -61,7 +61,7 @@ public: const ShadowInclusionList* inclusions() const { return m_inclusions.get(); } protected: - ShadowContentElement(const QualifiedName&, Document*); + HTMLContentElement(const QualifiedName&, Document*); private: virtual bool isContentElement() const { return true; } @@ -71,10 +71,10 @@ private: OwnPtr m_inclusions; }; -inline ShadowContentElement* toShadowContentElement(Node* node) +inline HTMLContentElement* toHTMLContentElement(Node* node) { ASSERT(!node || node->isContentElement()); - return static_cast(node); + return static_cast(node); } } diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp index c5ace05..d8ef005 100644 --- a/Source/WebCore/testing/Internals.cpp +++ b/Source/WebCore/testing/Internals.cpp @@ -35,6 +35,7 @@ #include "ExceptionCode.h" #include "Frame.h" #include "FrameView.h" +#include "HTMLContentElement.h" #include "HTMLInputElement.h" #include "HTMLNames.h" #include "HTMLTextAreaElement.h" @@ -46,7 +47,6 @@ #include "RenderObject.h" #include "RenderTreeAsText.h" #include "Settings.h" -#include "ShadowContentElement.h" #include "ShadowRoot.h" #include "SpellChecker.h" #include "TextIterator.h" @@ -128,14 +128,14 @@ bool Internals::isPreloaded(Document* document, const String& url) return document->cachedResourceLoader()->isPreloaded(url); } -PassRefPtr Internals::createShadowContentElement(Document* document, ExceptionCode& ec) +PassRefPtr Internals::createContentElement(Document* document, ExceptionCode& ec) { if (!document) { ec = INVALID_ACCESS_ERR; return 0; } - return ShadowContentElement::create(document); + return HTMLContentElement::create(document); } Element* Internals::getElementByIdInShadowRoot(Node* shadowRoot, const String& id, ExceptionCode& ec) diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h index 00fbc75..cc03630 100644 --- a/Source/WebCore/testing/Internals.h +++ b/Source/WebCore/testing/Internals.h @@ -59,7 +59,7 @@ public: void removeShadowRoot(Element* host, ExceptionCode&); Element* includerFor(Node*, ExceptionCode&); String shadowPseudoId(Element*, ExceptionCode&); - PassRefPtr createShadowContentElement(Document*, ExceptionCode&); + PassRefPtr createContentElement(Document*, ExceptionCode&); Element* getElementByIdInShadowRoot(Node* shadowRoot, const String& id, ExceptionCode&); #if ENABLE(INPUT_COLOR) diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl index f56d1af..8f16b32 100644 --- a/Source/WebCore/testing/Internals.idl +++ b/Source/WebCore/testing/Internals.idl @@ -35,7 +35,7 @@ module window { Element includerFor(in Node node) raises (DOMException); void removeShadowRoot(in Element host) raises (DOMException); DOMString shadowPseudoId(in Element element) raises (DOMException); - Element createShadowContentElement(in Document document) raises(DOMException); + Element createContentElement(in Document document) raises(DOMException); Element getElementByIdInShadowRoot(in Node shadowRoot, in DOMString id) raises(DOMException); #if defined(ENABLE_INPUT_COLOR) && ENABLE_INPUT_COLOR diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 9c0f5cf..ae7bcf6 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,13 @@ +2012-01-18 Shinya Kawanaka + + Move ShadowContentElement from dom/ to html/ and make ShadowContentElement subclass of HTMLElement. + https://bugs.webkit.org/show_bug.cgi?id=76241 + + Reviewed by Dimitri Glazkov. + + * win/WebKit2.def: Exposed necessary symbols. + * win/WebKit2CFLite.def: ditto. + 2012-01-17 Hajime Morrita [Internals] Should be able to access corresponding Document object. diff --git a/Source/WebKit2/win/WebKit2.def b/Source/WebKit2/win/WebKit2.def index f6365e5..cd2f963 100644 --- a/Source/WebKit2/win/WebKit2.def +++ b/Source/WebKit2/win/WebKit2.def @@ -150,8 +150,8 @@ EXPORTS ?add@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBE@Z ?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PAVStringImpl@2@@Z ?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z + ?create@HTMLContentElement@WebCore@@SA?AV?$PassRefPtr@VHTMLContentElement@WebCore@@@WTF@@PAVDocument@2@@Z ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z - ?create@ShadowContentElement@WebCore@@SA?AV?$PassRefPtr@VShadowContentElement@WebCore@@@WTF@@PAVDocument@2@@Z ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z ?ensureShadowRoot@Element@WebCore@@QAEPAVShadowRoot@2@XZ ?equal@WTF@@YA_NPBVStringImpl@1@PBE@Z diff --git a/Source/WebKit2/win/WebKit2CFLite.def b/Source/WebKit2/win/WebKit2CFLite.def index 9c82d97..1063db4 100644 --- a/Source/WebKit2/win/WebKit2CFLite.def +++ b/Source/WebKit2/win/WebKit2CFLite.def @@ -144,8 +144,8 @@ EXPORTS ?add@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBE@Z ?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PAVStringImpl@2@@Z ?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z + ?create@HTMLContentElement@WebCore@@SA?AV?$PassRefPtr@VHTMLContentElement@WebCore@@@WTF@@PAVDocument@2@@Z ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z - ?create@ShadowContentElement@WebCore@@SA?AV?$PassRefPtr@VShadowContentElement@WebCore@@@WTF@@PAVDocument@2@@Z ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z ?ensureShadowRoot@Element@WebCore@@QAEPAVShadowRoot@2@XZ ?equal@WTF@@YA_NPBVStringImpl@1@PBE@Z diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter index 3539150..3f8c86c 100644 --- a/Source/autotools/symbols.filter +++ b/Source/autotools/symbols.filter @@ -50,10 +50,10 @@ _ZN7WebCore15setDOMExceptionEPN3JSC9ExecStateEi; _ZN7WebCore16HTMLInputElement17setSuggestedValueERKN3WTF6StringE; _ZN7WebCore16jsStringSlowCaseEPN3JSC9ExecStateERN3WTF7HashMapIPNS3_10StringImplENS0_4WeakINS0_8JSStringEEENS3_10StringHashENS3_10HashTraitsIS6_EENSB_IS9_EEEES6_; _ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE; +_ZN7WebCore18HTMLContentElement6createEPNS_8DocumentE; _ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii; _ZN7WebCore20NodeRenderingContextC1EPNS_4NodeE; _ZN7WebCore20NodeRenderingContextD1Ev; -_ZN7WebCore20ShadowContentElement6createEPNS_8DocumentE; _ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE; _ZN7WebCore22externalRepresentationEPNS_7ElementEj; _ZN7WebCore24DocumentMarkerController10markersForEPNS_4NodeENS_14DocumentMarker11MarkerTypesE; -- 2.7.4