Commit 32bbc4c1 authored by benjamin@webkit.org's avatar benjamin@webkit.org

Remove the code guarded by STYLE_SCOPED

https://bugs.webkit.org/show_bug.cgi?id=122123

Reviewed by Anders Carlsson.

.: 

* Source/autotools/SetupWebKitFeatures.m4:
* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:

Source/JavaScriptCore: 

* Configurations/FeatureDefines.xcconfig:

Source/WebCore: 

Start cleaning the code related to <style scoped>. This patch
only removes the code with #ifdef guards.

* Configurations/FeatureDefines.xcconfig:
* WebCore.exp.in:
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/generic/RuntimeEnabledFeatures.h:
* css/DocumentRuleSets.cpp:
(WebCore::DocumentRuleSets::appendAuthorStyleSheets):
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::matchScopedAuthorRules):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::locateCousinList):
(WebCore::StyleResolver::canShareStyleWithElement):
(WebCore::StyleResolver::locateSharedStyle):
* css/StyleResolver.h:
(WebCore::StyleResolver::ensureScopeResolver):
* css/StyleScopeResolver.cpp:
* css/StyleScopeResolver.h:
* dom/Node.cpp:
* dom/Node.h:
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::ShadowRoot):
* dom/ShadowRoot.h:
* html/HTMLStyleElement.cpp:
(WebCore::HTMLStyleElement::HTMLStyleElement):
(WebCore::HTMLStyleElement::parseAttribute):
(WebCore::HTMLStyleElement::insertedInto):
(WebCore::HTMLStyleElement::removedFrom):
* html/HTMLStyleElement.h:
* html/HTMLStyleElement.idl:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
* testing/Internals.cpp:
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKit: 

* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:

Source/WebKit/gtk: 

* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
* WebCoreSupport/DumpRenderTreeSupportGtk.h:

Source/WebKit/mac: 

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2: 

* Configurations/FeatureDefines.xcconfig:

Source/WTF: 

* wtf/FeatureDefines.h:

Tools: 

* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* Scripts/webkitperl/FeatureList.pm:
* qmake/mkspecs/features/features.pri:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156683 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9204ef61
2013-09-30 Benjamin Poulain <benjamin@webkit.org>
Remove the code guarded by STYLE_SCOPED
https://bugs.webkit.org/show_bug.cgi?id=122123
Reviewed by Anders Carlsson.
* Source/autotools/SetupWebKitFeatures.m4:
* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
2013-09-30 Allan Sandfeld Jensen <allan.jensen@digia.com>
[Qt] Fix force_static_libs_as_shared in WebKit2
......
2013-09-30 Benjamin Poulain <benjamin@webkit.org>
Remove the code guarded by STYLE_SCOPED
https://bugs.webkit.org/show_bug.cgi?id=122123
Reviewed by Anders Carlsson.
* Configurations/FeatureDefines.xcconfig:
2013-09-30 Andreas Kling <akling@apple.com>
Pass VM instead of ExecState to ObjectPrototype constructor.
......@@ -165,7 +165,6 @@ ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_STYLE_SCOPED = ;
ENABLE_SUBPIXEL_LAYOUT = ;
ENABLE_SVG = ENABLE_SVG;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
......@@ -188,4 +187,4 @@ ENABLE_XSLT = ENABLE_XSLT;
ENABLE_FTL_JIT = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
2013-09-30 Benjamin Poulain <benjamin@webkit.org>
Remove the code guarded by STYLE_SCOPED
https://bugs.webkit.org/show_bug.cgi?id=122123
Reviewed by Anders Carlsson.
* wtf/FeatureDefines.h:
2013-09-28 Mark Rowe <mrowe@apple.com>
Take Xcode's advice and enable some extra warnings.
......
......@@ -762,10 +762,6 @@
#define ENABLE_SQL_DATABASE 1
#endif
#if !defined(ENABLE_STYLE_SCOPED)
#define ENABLE_STYLE_SCOPED 0
#endif
#if !defined(ENABLE_SUBPIXEL_LAYOUT)
#define ENABLE_SUBPIXEL_LAYOUT 0
#endif
......
2013-09-30 Benjamin Poulain <benjamin@webkit.org>
Remove the code guarded by STYLE_SCOPED
https://bugs.webkit.org/show_bug.cgi?id=122123
Reviewed by Anders Carlsson.
Start cleaning the code related to <style scoped>. This patch
only removes the code with #ifdef guards.
* Configurations/FeatureDefines.xcconfig:
* WebCore.exp.in:
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/generic/RuntimeEnabledFeatures.h:
* css/DocumentRuleSets.cpp:
(WebCore::DocumentRuleSets::appendAuthorStyleSheets):
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::matchScopedAuthorRules):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::locateCousinList):
(WebCore::StyleResolver::canShareStyleWithElement):
(WebCore::StyleResolver::locateSharedStyle):
* css/StyleResolver.h:
(WebCore::StyleResolver::ensureScopeResolver):
* css/StyleScopeResolver.cpp:
* css/StyleScopeResolver.h:
* dom/Node.cpp:
* dom/Node.h:
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::ShadowRoot):
* dom/ShadowRoot.h:
* html/HTMLStyleElement.cpp:
(WebCore::HTMLStyleElement::HTMLStyleElement):
(WebCore::HTMLStyleElement::parseAttribute):
(WebCore::HTMLStyleElement::insertedInto):
(WebCore::HTMLStyleElement::removedFrom):
* html/HTMLStyleElement.h:
* html/HTMLStyleElement.idl:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
* testing/Internals.cpp:
* testing/Internals.h:
* testing/Internals.idl:
2013-09-30 Drew Yao <ayao@apple.com>
ASSERT(!m_hasBadParent) in InlineBox::parent() should be ASSERT_WITH_SECURITY_IMPLICATION
......@@ -165,7 +165,6 @@ ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_STYLE_SCOPED = ;
ENABLE_SUBPIXEL_LAYOUT = ;
ENABLE_SVG = ENABLE_SVG;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
......@@ -188,4 +187,4 @@ ENABLE_XSLT = ENABLE_XSLT;
ENABLE_FTL_JIT = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
......@@ -2728,10 +2728,6 @@ __ZN7WebCore8Document13svgExtensionsEv
__ZN7WebCore8Document19accessSVGExtensionsEv
#endif
#if ENABLE(STYLE_SCOPED)
__ZNK7WebCore4Node31numberOfScopedHTMLStyleChildrenEv
#endif
#if ENABLE(THREADED_SCROLLING)
__ZN7WebCore13ScrollingTree37setScrollingPerformanceLoggingEnabledEb
__ZN7WebCore13ScrollingTree21tryToHandleWheelEventERKNS_18PlatformWheelEventE
......
......@@ -107,9 +107,6 @@ RuntimeEnabledFeatures::RuntimeEnabledFeatures()
#if ENABLE(CUSTOM_ELEMENTS)
, m_isCustomDOMElementsEnabled(false)
#endif
#if ENABLE(STYLE_SCOPED)
, m_isStyleScopedEnabled(false)
#endif
#if ENABLE(INPUT_TYPE_DATE)
, m_isInputTypeDateEnabled(true)
#endif
......
......@@ -244,11 +244,6 @@ public:
void setCustomDOMElements(bool isEnabled) { m_isCustomDOMElementsEnabled = isEnabled; }
#endif
#if ENABLE(STYLE_SCOPED)
bool styleScopedEnabled() const { return m_isStyleScopedEnabled; }
void setStyleScopedEnabled(bool isEnabled) { m_isStyleScopedEnabled = isEnabled; }
#endif
#if ENABLE(INPUT_TYPE_DATE)
bool inputTypeDateEnabled() const { return m_isInputTypeDateEnabled; }
void setInputTypeDateEnabled(bool isEnabled) { m_isInputTypeDateEnabled = isEnabled; }
......@@ -369,10 +364,6 @@ private:
bool m_isCustomDOMElementsEnabled;
#endif
#if ENABLE(STYLE_SCOPED)
bool m_isStyleScopedEnabled;
#endif
#if ENABLE(INPUT_TYPE_DATE)
bool m_isInputTypeDateEnabled;
#endif
......
......@@ -94,7 +94,7 @@ void DocumentRuleSets::appendAuthorStyleSheets(unsigned firstNew, const Vector<R
if (cssSheet->mediaQueries() && !medium->eval(cssSheet->mediaQueries(), resolver))
continue;
StyleSheetContents* sheet = cssSheet->contents();
#if ENABLE(STYLE_SCOPED) || ENABLE(SHADOW_DOM)
#if ENABLE(SHADOW_DOM)
if (const ContainerNode* scope = StyleScopeResolver::scopeFor(cssSheet)) {
// FIXME: Remove a dependency to calling a StyleResolver's member function.
// If we can avoid calling resolver->ensureScopeResolver() here, we don't have to include "StyleResolver.h".
......
......@@ -230,7 +230,7 @@ void ElementRuleCollector::sortAndTransferMatchedRules()
void ElementRuleCollector::matchScopedAuthorRules(bool includeEmptyRules)
{
#if ENABLE(STYLE_SCOPED) || ENABLE(SHADOW_DOM)
#if ENABLE(SHADOW_DOM)
if (!m_scopeResolver)
return;
......
......@@ -462,10 +462,6 @@ Node* StyleResolver::locateCousinList(Element* parent, unsigned& visitedNodeCoun
return 0;
if (!parent || !parent->isStyledElement())
return 0;
#if ENABLE(STYLE_SCOPED)
if (parent->hasScopedHTMLStyleChild())
return 0;
#endif
StyledElement* p = static_cast<StyledElement*>(parent);
if (p->inlineStyle())
return 0;
......@@ -655,10 +651,6 @@ bool StyleResolver::canShareStyleWithElement(StyledElement* element) const
if (element->hasID() && m_ruleSets.features().idsInRules.contains(element->idForStyleResolution().impl()))
return false;
#if ENABLE(STYLE_SCOPED)
if (element->hasScopedHTMLStyleChild())
return false;
#endif
// FIXME: We should share style for option and optgroup whenever possible.
// Before doing so, we need to resolve issues in HTMLSelectElement::recalcListItems
......@@ -742,10 +734,6 @@ RenderStyle* StyleResolver::locateSharedStyle()
return 0;
if (parentElementPreventsSharing(state.element()->parentElement()))
return 0;
#if ENABLE(STYLE_SCOPED)
if (state.styledElement()->hasScopedHTMLStyleChild())
return 0;
#endif
if (state.element() == state.document().cssTarget())
return 0;
if (elementHasDirectionAuto(state.element()))
......
......@@ -193,18 +193,10 @@ public:
const DocumentRuleSets& ruleSets() const { return m_ruleSets; }
SelectorFilter& selectorFilter() { return m_selectorFilter; }
#if ENABLE(STYLE_SCOPED) || ENABLE(SHADOW_DOM)
#if ENABLE(SHADOW_DOM)
StyleScopeResolver* ensureScopeResolver()
{
#if ENABLE(STYLE_SCOPED)
#if ENABLE(SHADOW_DOM)
ASSERT(RuntimeEnabledFeatures::sharedFeatures().shadowDOMEnabled() || RuntimeEnabledFeatures::sharedFeatures().styleScopedEnabled());
#else
ASSERT(RuntimeEnabledFeatures::sharedFeatures().styleScopedEnabled());
#endif
#else
ASSERT(RuntimeEnabledFeatures::sharedFeatures().shadowDOMEnabled());
#endif
if (!m_scopeResolver)
m_scopeResolver = adoptPtr(new StyleScopeResolver());
return m_scopeResolver.get();
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include "StyleScopeResolver.h"
#if ENABLE(STYLE_SCOPED) || ENABLE(SHADOW_DOM)
#if ENABLE(SHADOW_DOM)
#include "CSSStyleRule.h"
#include "CSSStyleSheet.h"
......@@ -225,4 +225,4 @@ void StyleScopeResolver::matchHostRules(const Element* element, Vector<RuleSet*>
}
#endif // ENABLE(STYLE_SCOPED)
#endif // ENABLE(SHADOW_DOM)
......@@ -43,7 +43,7 @@ class ShadowRoot;
class StyleRuleHost;
struct RuleFeatureSet;
#if ENABLE(STYLE_SCOPED) || ENABLE(SHADOW_DOM)
#if ENABLE(SHADOW_DOM)
class StyleScopeResolver {
public:
......@@ -118,7 +118,7 @@ public:
RuleSet* ensureRuleSetFor(const ContainerNode*) { return 0; }
};
#endif // ENABLE(STYLE_SCOPED)
#endif // ENABLE(SHADOW_DOM)
} // namespace WebCore
......
......@@ -2326,34 +2326,6 @@ void Node::updateAncestorConnectedSubframeCountForInsertion() const
node->incrementConnectedSubframeCount(count);
}
#if ENABLE(STYLE_SCOPED)
// FIXME: What is this code doing in Node, srsly?
void Node::registerScopedHTMLStyleChild()
{
setHasScopedHTMLStyleChild(true);
}
void Node::unregisterScopedHTMLStyleChild()
{
ASSERT(hasScopedHTMLStyleChild());
setHasScopedHTMLStyleChild(numberOfScopedHTMLStyleChildren());
}
size_t Node::numberOfScopedHTMLStyleChildren() const
{
if (!isContainerNode())
return 0;
size_t count = 0;
auto styleDescendants = descendantsOfType<HTMLStyleElement>(toContainerNode(this));
for (auto style = styleDescendants.begin(), end = styleDescendants.end(); style != end; ++style) {
if (style->isRegisteredAsScoped())
count++;
}
return count;
}
#endif
} // namespace WebCore
#ifndef NDEBUG
......
......@@ -343,11 +343,6 @@ public:
void setInNamedFlow() { setFlag(InNamedFlowFlag); }
void clearInNamedFlow() { clearFlag(InNamedFlowFlag); }
#if ENABLE(STYLE_SCOPED)
bool hasScopedHTMLStyleChild() const { return getFlag(HasScopedHTMLStyleChildFlag); }
void setHasScopedHTMLStyleChild(bool flag) { setFlag(flag, HasScopedHTMLStyleChildFlag); }
#endif
bool hasEventTargetData() const { return getFlag(HasEventTargetDataFlag); }
void setHasEventTargetData(bool flag) { setFlag(flag, HasEventTargetDataFlag); }
......@@ -579,12 +574,6 @@ public:
void unregisterTransientMutationObserver(MutationObserverRegistration*);
void notifyMutationObserversNodeWillDetach();
#if ENABLE(STYLE_SCOPED)
virtual void registerScopedHTMLStyleChild();
virtual void unregisterScopedHTMLStyleChild();
size_t numberOfScopedHTMLStyleChildren() const;
#endif
void textRects(Vector<IntRect>&) const;
unsigned connectedSubframeCount() const;
......@@ -627,12 +616,9 @@ private:
InNamedFlowFlag = 1 << 19,
HasSyntheticAttrChildNodesFlag = 1 << 20,
HasCustomStyleResolveCallbacksFlag = 1 << 21,
#if ENABLE(STYLE_SCOPED)
HasScopedHTMLStyleChildFlag = 1 << 22,
#endif
HasEventTargetDataFlag = 1 << 23,
NeedsNodeRenderingTraversalSlowPathFlag = 1 << 25,
IsInShadowTreeFlag = 1 << 26,
HasEventTargetDataFlag = 1 << 22,
NeedsNodeRenderingTraversalSlowPathFlag = 1 << 23,
IsInShadowTreeFlag = 1 << 24,
DefaultNodeFlags = IsParsingChildrenFinishedFlag
};
......
......@@ -55,9 +55,6 @@ enum ShadowRootUsageOriginType {
ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
: DocumentFragment(0, CreateShadowRoot)
, TreeScope(this, &document)
#if ENABLE(STYLE_SCOPED)
, m_numberOfStyles(0)
#endif
, m_applyAuthorStyles(false)
, m_resetStyleInheritance(false)
, m_type(type)
......@@ -158,21 +155,6 @@ void ShadowRoot::childrenChanged(const ChildChange& change)
invalidateDistribution();
}
#if ENABLE(STYLE_SCOPED)
void ShadowRoot::registerScopedHTMLStyleChild()
{
++m_numberOfStyles;
setHasScopedHTMLStyleChild(true);
}
void ShadowRoot::unregisterScopedHTMLStyleChild()
{
ASSERT(hasScopedHTMLStyleChild() && m_numberOfStyles > 0);
--m_numberOfStyles;
setHasScopedHTMLStyleChild(m_numberOfStyles > 0);
}
#endif
void ShadowRoot::removeAllEventListeners()
{
DocumentFragment::removeAllEventListeners();
......
......@@ -69,11 +69,6 @@ public:
Element* activeElement() const;
#if ENABLE(STYLE_SCOPED)
virtual void registerScopedHTMLStyleChild() OVERRIDE;
virtual void unregisterScopedHTMLStyleChild() OVERRIDE;
#endif
ShadowRootType type() const { return static_cast<ShadowRootType>(m_type); }
PassRefPtr<Node> cloneNode(bool, ExceptionCode&);
......@@ -96,9 +91,6 @@ private:
// FIXME: This shouldn't happen. https://bugs.webkit.org/show_bug.cgi?id=88834
bool isOrphan() const { return !hostElement(); }
#if ENABLE(STYLE_SCOPED)
unsigned m_numberOfStyles : 28;
#endif
unsigned m_applyAuthorStyles : 1;
unsigned m_resetStyleInheritance : 1;
unsigned m_type : 1;
......
......@@ -50,9 +50,6 @@ inline HTMLStyleElement::HTMLStyleElement(const QualifiedName& tagName, Document
, m_styleSheetOwner(document, createdByParser)
, m_firedLoad(false)
, m_loadedSheet(false)
#if ENABLE(STYLE_SCOPED)
, m_scopedStyleRegistrationState(NotRegistered)
#endif
{
ASSERT(hasTagName(styleTag));
}
......@@ -75,10 +72,6 @@ void HTMLStyleElement::parseAttribute(const QualifiedName& name, const AtomicStr
{
if (name == titleAttr && sheet())
sheet()->setTitle(value);
#if ENABLE(STYLE_SCOPED)
else if (name == scopedAttr && RuntimeEnabledFeatures::sharedFeatures().styleScopedEnabled())
scopedAttributeChanged(!value.isNull());
#endif
else if (name == mediaAttr) {
m_styleSheetOwner.setMedia(value);
if (sheet()) {
......@@ -98,119 +91,11 @@ void HTMLStyleElement::finishParsingChildren()
HTMLElement::finishParsingChildren();
}
#if ENABLE(STYLE_SCOPED)
void HTMLStyleElement::scopedAttributeChanged(bool scoped)
{
ASSERT(RuntimeEnabledFeatures::sharedFeatures().styleScopedEnabled());
if (!inDocument())
return;
if (scoped) {
// As any <style> in a shadow tree is treated as "scoped",
// need to remove the <style> from its shadow root.
if (m_scopedStyleRegistrationState == RegisteredInShadowRoot)
unregisterWithScopingNode(containingShadowRoot());
if (m_scopedStyleRegistrationState != RegisteredAsScoped)
registerWithScopingNode(true);
return;
}
// If the <style> was scoped, need to remove the <style> from the scoping
// element, i.e. the parent node.
if (m_scopedStyleRegistrationState == RegisteredAsScoped)
unregisterWithScopingNode(parentNode());
// As any <style> in a shadow tree is treated as "scoped",
// need to add the <style> to its shadow root.
if (isInShadowTree() && m_scopedStyleRegistrationState != RegisteredInShadowRoot)
registerWithScopingNode(false);
}
void HTMLStyleElement::registerWithScopingNode(bool scoped)
{
// Note: We cannot rely on the 'scoped' element already being present when this method is invoked.
// Therefore we cannot rely on scoped()!
ASSERT(m_scopedStyleRegistrationState == NotRegistered);
ASSERT(inDocument());
if (m_scopedStyleRegistrationState != NotRegistered)
return;
ContainerNode* scope = scoped ? parentNode() : containingShadowRoot();
if (!scope)
return;
if (!scope->isElementNode() && !scope->isShadowRoot()) {
// DocumentFragment nodes should never be inDocument,
// <style> should not be a child of Document, PI or some such.
ASSERT_NOT_REACHED();
return;
}
scope->registerScopedHTMLStyleChild();
if (scope->isShadowRoot())
scope->shadowHost()->setNeedsStyleRecalc();
else
scope->setNeedsStyleRecalc();
if (inDocument() && !document().parsing() && document().hasLivingRenderTree())
document().styleResolverChanged(DeferRecalcStyle);
m_scopedStyleRegistrationState = scoped ? RegisteredAsScoped : RegisteredInShadowRoot;
}
void HTMLStyleElement::unregisterWithScopingNode(ContainerNode* scope)
{
ASSERT(m_scopedStyleRegistrationState != NotRegistered || !RuntimeEnabledFeatures::sharedFeatures().styleScopedEnabled());
if (!isRegisteredAsScoped())
return;
ASSERT(scope);
if (scope) {
ASSERT(scope->hasScopedHTMLStyleChild());
scope->unregisterScopedHTMLStyleChild();
scope->setNeedsStyleRecalc();
}
if (inDocument() && !document().parsing() && document().hasLivingRenderTree())
document().styleResolverChanged(DeferRecalcStyle);
m_scopedStyleRegistrationState = NotRegistered;
}
bool HTMLStyleElement::scoped() const
{
return RuntimeEnabledFeatures::sharedFeatures().styleScopedEnabled() && fastHasAttribute(scopedAttr);
}
void HTMLStyleElement::setScoped(bool scopedValue)
{
setBooleanAttribute(scopedAttr, scopedValue);
}
Element* HTMLStyleElement::scopingElement() const
{
if (!scoped())
return 0;
// FIXME: This probably needs to be refined for scoped stylesheets within shadow DOM.
// As written, such a stylesheet could style the host element, as well as children of the host.
// OTOH, this paves the way for a :bound-element implementation.
ContainerNode* parentOrShadowHost = parentOrShadowHostNode();
if (!parentOrShadowHost || !parentOrShadowHost->isElementNode())
return 0;
return toElement(parentOrShadowHost);
}
#endif // ENABLE(STYLE_SCOPED)
Node::InsertionNotificationRequest HTMLStyleElement::insertedInto(ContainerNode* insertionPoint)
{
HTMLElement::insertedInto(insertionPoint);
if (insertionPoint->inDocument()) {
if (insertionPoint->inDocument())
m_styleSheetOwner.insertedIntoDocument(document(), *this);
#if ENABLE(STYLE_SCOPED)
if (m_scopedStyleRegistrationState == NotRegistered && (scoped() || isInShadowTree()))
registerWithScopingNode(scoped());
#endif
}
return InsertionDone;
}
......@@ -219,23 +104,6 @@ void HTMLStyleElement::removedFrom(ContainerNode* insertionPoint)
{
HTMLElement::removedFrom(insertionPoint);
#if ENABLE(STYLE_SCOPED)
// In the current implementation, <style scoped> is only registered if the node is in the document.
// That is, because willRemove() is also called if an ancestor is removed from the document.
// Now, if we want to register <style scoped> even if it's not inDocument,
// we'd need to find a way to discern whether that is the case, or whether <style scoped> itself is about to be removed.
if (m_scopedStyleRegistrationState != NotRegistered) {
ContainerNode* scope;
if (m_scopedStyleRegistrationState == RegisteredInShadowRoot) {
scope = containingShadowRoot();
if (!scope)
scope = insertionPoint->containingShadowRoot();
} else
scope = parentNode() ? parentNode() : insertionPoint;
unregisterWithScopingNode(scope);
}
#endif
if (insertionPoint->inDocument())
m_styleSheetOwner.removedFromDocument(document(), *this);
}
......
......@@ -39,20 +39,6 @@ public:
static PassRefPtr<HTMLStyleElement> create(const QualifiedName&, Document&, bool createdByParser);
virtual ~HTMLStyleElement();
#if ENABLE(STYLE_SCOPED)
bool scoped() const;
void setScoped(bool);
Element* scopingElement() const;
bool isRegisteredAsScoped() const
{
// Note: We cannot rely on the 'scoped' attribute still being present when this method is invoked.
// Therefore we cannot rely on scoped()!
if (m_scopedStyleRegistrationState == NotRegistered)
return false;
return true;
}
#endif
CSSStyleSheet* sheet() const { return m_styleSheetOwner.sheet(); }
bool disabled() const;
......@@ -79,24 +65,9 @@ private:
virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const;
#if ENABLE(STYLE_SCOPED)
void scopedAttributeChanged(bool);
void registerWithScopingNode(bool);
void unregisterWithScopingNode(ContainerNode*);
#endif
InlineStyleSheetOwner m_styleSheetOwner;
bool m_firedLoad;
bool m_loadedSheet;
#if ENABLE(STYLE_SCOPED)
enum ScopedStyleRegistrationState {
NotRegistered,
RegisteredAsScoped,