Skip to content

GitLab

T
tangled
Commit 8f20a740 authored by hayato@chromium.org's avatar hayato@chromium.org
Browse files
Options

Remove Runtime ShadowDOM flag. 

This patch also cleans up CSSSelector so that it doesn't use ShadowDOM flag.
Runtime ShadowDOM flag was already set to true at r169201. This change shouldn't have any effects.

BUG=336121

Review URL: https://codereview.chromium.org/210763002

git-svn-id: svn://svn.chromium.org/blink/trunk@170009 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 67f59b8a
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 86 deletions
third_party/WebKit/Source/core/css/CSSSelector.cpp
View file @ 8f20a740
...@@ -274,90 +274,89 @@ PseudoId CSSSelector::pseudoId(PseudoType type) ...@@ -274,90 +274,89 @@ PseudoId CSSSelector::pseudoId(PseudoType type)
struct NameToPseudoStruct { struct NameToPseudoStruct {
const char* string; const char* string;
unsigned type:8; unsigned type:8;
unsigned requirement:8;
}; };
const static NameToPseudoStruct pseudoTypeMap[] = { const static NameToPseudoStruct pseudoTypeMap[] = {
{"active", CSSSelector::PseudoActive, 0}, {"active", CSSSelector::PseudoActive},
{"after", CSSSelector::PseudoAfter, 0}, {"after", CSSSelector::PseudoAfter},
{"-webkit-any(", CSSSelector::PseudoAny, 0}, {"-webkit-any(", CSSSelector::PseudoAny},
{"-webkit-any-link", CSSSelector::PseudoAnyLink, 0}, {"-webkit-any-link", CSSSelector::PseudoAnyLink},
{"-webkit-autofill", CSSSelector::PseudoAutofill, 0}, {"-webkit-autofill", CSSSelector::PseudoAutofill},
{"backdrop", CSSSelector::PseudoBackdrop, 0}, {"backdrop", CSSSelector::PseudoBackdrop},
{"before", CSSSelector::PseudoBefore, 0}, {"before", CSSSelector::PseudoBefore},
{"checked", CSSSelector::PseudoChecked, 0}, {"checked", CSSSelector::PseudoChecked},
{"default", CSSSelector::PseudoDefault, 0}, {"default", CSSSelector::PseudoDefault},
{"disabled", CSSSelector::PseudoDisabled, 0}, {"disabled", CSSSelector::PseudoDisabled},
{"read-only", CSSSelector::PseudoReadOnly, 0}, {"read-only", CSSSelector::PseudoReadOnly},
{"read-write", CSSSelector::PseudoReadWrite, 0}, {"read-write", CSSSelector::PseudoReadWrite},
{"valid", CSSSelector::PseudoValid, 0}, {"valid", CSSSelector::PseudoValid},
{"invalid", CSSSelector::PseudoInvalid, 0}, {"invalid", CSSSelector::PseudoInvalid},
{"-webkit-drag", CSSSelector::PseudoDrag, 0}, {"-webkit-drag", CSSSelector::PseudoDrag},
{"empty", CSSSelector::PseudoEmpty, 0}, {"empty", CSSSelector::PseudoEmpty},
{"enabled", CSSSelector::PseudoEnabled, 0}, {"enabled", CSSSelector::PseudoEnabled},
{"first-child", CSSSelector::PseudoFirstChild, 0}, {"first-child", CSSSelector::PseudoFirstChild},
{"first-letter", CSSSelector::PseudoFirstLetter, 0}, {"first-letter", CSSSelector::PseudoFirstLetter},
{"first-line", CSSSelector::PseudoFirstLine, 0}, {"first-line", CSSSelector::PseudoFirstLine},
{"first-of-type", CSSSelector::PseudoFirstOfType, 0}, {"first-of-type", CSSSelector::PseudoFirstOfType},
{"-webkit-full-page-media", CSSSelector::PseudoFullPageMedia, 0}, {"-webkit-full-page-media", CSSSelector::PseudoFullPageMedia},
{"nth-child(", CSSSelector::PseudoNthChild, 0}, {"nth-child(", CSSSelector::PseudoNthChild},
{"nth-of-type(", CSSSelector::PseudoNthOfType, 0}, {"nth-of-type(", CSSSelector::PseudoNthOfType},
{"nth-last-child(", CSSSelector::PseudoNthLastChild, 0}, {"nth-last-child(", CSSSelector::PseudoNthLastChild},
{"nth-last-of-type(", CSSSelector::PseudoNthLastOfType, 0}, {"nth-last-of-type(", CSSSelector::PseudoNthLastOfType},
{"focus", CSSSelector::PseudoFocus, 0}, {"focus", CSSSelector::PseudoFocus},
{"hover", CSSSelector::PseudoHover, 0}, {"hover", CSSSelector::PseudoHover},
{"indeterminate", CSSSelector::PseudoIndeterminate, 0}, {"indeterminate", CSSSelector::PseudoIndeterminate},
{"last-child", CSSSelector::PseudoLastChild, 0}, {"last-child", CSSSelector::PseudoLastChild},
{"last-of-type", CSSSelector::PseudoLastOfType, 0}, {"last-of-type", CSSSelector::PseudoLastOfType},
{"link", CSSSelector::PseudoLink, 0}, {"link", CSSSelector::PseudoLink},
{"lang(", CSSSelector::PseudoLang, 0}, {"lang(", CSSSelector::PseudoLang},
{"not(", CSSSelector::PseudoNot, 0}, {"not(", CSSSelector::PseudoNot},
{"only-child", CSSSelector::PseudoOnlyChild, 0}, {"only-child", CSSSelector::PseudoOnlyChild},
{"only-of-type", CSSSelector::PseudoOnlyOfType, 0}, {"only-of-type", CSSSelector::PseudoOnlyOfType},
{"optional", CSSSelector::PseudoOptional, 0}, {"optional", CSSSelector::PseudoOptional},
{"required", CSSSelector::PseudoRequired, 0}, {"required", CSSSelector::PseudoRequired},
{"-webkit-resizer", CSSSelector::PseudoResizer, 0}, {"-webkit-resizer", CSSSelector::PseudoResizer},
{"root", CSSSelector::PseudoRoot, 0}, {"root", CSSSelector::PseudoRoot},
{"-webkit-scrollbar", CSSSelector::PseudoScrollbar, 0}, {"-webkit-scrollbar", CSSSelector::PseudoScrollbar},
{"-webkit-scrollbar-button", CSSSelector::PseudoScrollbarButton, 0}, {"-webkit-scrollbar-button", CSSSelector::PseudoScrollbarButton},
{"-webkit-scrollbar-corner", CSSSelector::PseudoScrollbarCorner, 0}, {"-webkit-scrollbar-corner", CSSSelector::PseudoScrollbarCorner},
{"-webkit-scrollbar-thumb", CSSSelector::PseudoScrollbarThumb, 0}, {"-webkit-scrollbar-thumb", CSSSelector::PseudoScrollbarThumb},
{"-webkit-scrollbar-track", CSSSelector::PseudoScrollbarTrack, 0}, {"-webkit-scrollbar-track", CSSSelector::PseudoScrollbarTrack},
{"-webkit-scrollbar-track-piece", CSSSelector::PseudoScrollbarTrackPiece, 0}, {"-webkit-scrollbar-track-piece", CSSSelector::PseudoScrollbarTrackPiece},
{"selection", CSSSelector::PseudoSelection, 0}, {"selection", CSSSelector::PseudoSelection},
{"target", CSSSelector::PseudoTarget, 0}, {"target", CSSSelector::PseudoTarget},
{"visited", CSSSelector::PseudoVisited, 0}, {"visited", CSSSelector::PseudoVisited},
{"window-inactive", CSSSelector::PseudoWindowInactive, 0}, {"window-inactive", CSSSelector::PseudoWindowInactive},
{"decrement", CSSSelector::PseudoDecrement, 0}, {"decrement", CSSSelector::PseudoDecrement},
{"increment", CSSSelector::PseudoIncrement, 0}, {"increment", CSSSelector::PseudoIncrement},
{"start", CSSSelector::PseudoStart, 0}, {"start", CSSSelector::PseudoStart},
{"end", CSSSelector::PseudoEnd, 0}, {"end", CSSSelector::PseudoEnd},
{"horizontal", CSSSelector::PseudoHorizontal, 0}, {"horizontal", CSSSelector::PseudoHorizontal},
{"vertical", CSSSelector::PseudoVertical, 0}, {"vertical", CSSSelector::PseudoVertical},
{"double-button", CSSSelector::PseudoDoubleButton, 0}, {"double-button", CSSSelector::PseudoDoubleButton},
{"single-button", CSSSelector::PseudoSingleButton, 0}, {"single-button", CSSSelector::PseudoSingleButton},
{"no-button", CSSSelector::PseudoNoButton, 0}, {"no-button", CSSSelector::PseudoNoButton},
{"corner-present", CSSSelector::PseudoCornerPresent, 0}, {"corner-present", CSSSelector::PseudoCornerPresent},
{"first", CSSSelector::PseudoFirstPage, 0}, {"first", CSSSelector::PseudoFirstPage},
{"left", CSSSelector::PseudoLeftPage, 0}, {"left", CSSSelector::PseudoLeftPage},
{"right", CSSSelector::PseudoRightPage, 0}, {"right", CSSSelector::PseudoRightPage},
{"-webkit-full-screen", CSSSelector::PseudoFullScreen, 0}, {"-webkit-full-screen", CSSSelector::PseudoFullScreen},
{"-webkit-full-screen-document", CSSSelector::PseudoFullScreenDocument, 0}, {"-webkit-full-screen-document", CSSSelector::PseudoFullScreenDocument},
{"-webkit-full-screen-ancestor", CSSSelector::PseudoFullScreenAncestor, 0}, {"-webkit-full-screen-ancestor", CSSSelector::PseudoFullScreenAncestor},
{"cue(", CSSSelector::PseudoCue, 0}, {"cue(", CSSSelector::PseudoCue},
{"cue", CSSSelector::PseudoWebKitCustomElement, 0}, {"cue", CSSSelector::PseudoWebKitCustomElement},
{"future", CSSSelector::PseudoFutureCue, 0}, {"future", CSSSelector::PseudoFutureCue},
{"past", CSSSelector::PseudoPastCue, 0}, {"past", CSSSelector::PseudoPastCue},
{"-webkit-distributed(", CSSSelector::PseudoDistributed, 0}, {"-webkit-distributed(", CSSSelector::PseudoDistributed},
{"in-range", CSSSelector::PseudoInRange, 0}, {"in-range", CSSSelector::PseudoInRange},
{"out-of-range", CSSSelector::PseudoOutOfRange, 0}, {"out-of-range", CSSSelector::PseudoOutOfRange},
{"scope", CSSSelector::PseudoScope, 0}, {"scope", CSSSelector::PseudoScope},
{"unresolved", CSSSelector::PseudoUnresolved, 0}, {"unresolved", CSSSelector::PseudoUnresolved},
{"host", CSSSelector::PseudoHost, CSSSelector::RequiresShadowDOM}, {"host", CSSSelector::PseudoHost},
{"host(", CSSSelector::PseudoHost, CSSSelector::RequiresShadowDOM}, {"host(", CSSSelector::PseudoHost},
{"ancestor", CSSSelector::PseudoAncestor, CSSSelector::RequiresShadowDOM}, {"ancestor", CSSSelector::PseudoAncestor},
{"ancestor(", CSSSelector::PseudoAncestor, CSSSelector::RequiresShadowDOM}, {"ancestor(", CSSSelector::PseudoAncestor},
{"content", CSSSelector::PseudoContent, CSSSelector::RequiresShadowDOM}, {"content", CSSSelector::PseudoContent},
}; };
static HashMap<StringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap() static HashMap<StringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap()
...@@ -368,10 +367,6 @@ static HashMap<StringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap() ...@@ -368,10 +367,6 @@ static HashMap<StringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap()
size_t pseudoCount = WTF_ARRAY_LENGTH(pseudoTypeMap); size_t pseudoCount = WTF_ARRAY_LENGTH(pseudoTypeMap);
for (size_t i = 0; i < pseudoCount; i++) { for (size_t i = 0; i < pseudoCount; i++) {
if (pseudoTypeMap[i].requirement == CSSSelector::RequiresShadowDOM) {
if (!RuntimeEnabledFeatures::shadowDOMEnabled())
continue;
}
const char* str = pseudoTypeMap[i].string; const char* str = pseudoTypeMap[i].string;
CSSSelector::PseudoType type; CSSSelector::PseudoType type;
type = static_cast<CSSSelector::PseudoType>(pseudoTypeMap[i].type); type = static_cast<CSSSelector::PseudoType>(pseudoTypeMap[i].type);
......
third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
View file @ 8f20a740
...@@ -99,7 +99,6 @@ ScrollTopLeftInterop status=experimental ...@@ -99,7 +99,6 @@ ScrollTopLeftInterop status=experimental
ServiceWorker status=experimental ServiceWorker status=experimental
SessionStorage status=stable SessionStorage status=stable
ShadowDOM status=stable
SharedWorker status=stable SharedWorker status=stable
SpeechInput status=stable SpeechInput status=stable
SpeechSynthesis status=stable SpeechSynthesis status=stable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment