Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Unified Diff: Source/WebCore/css/CSSSelector.cpp

Issue 13646006: Remove the ENABLE_IFRAME_SEAMLESS compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/css/CSSSelector.cpp
diff --git a/Source/WebCore/css/CSSSelector.cpp b/Source/WebCore/css/CSSSelector.cpp
index 6944b65e988c2d39fd4028407f325f6ba0e97226..e35153c20886c7c372815ea5129d7de4cc5a2ff5 100644
--- a/Source/WebCore/css/CSSSelector.cpp
+++ b/Source/WebCore/css/CSSSelector.cpp
@@ -236,14 +236,12 @@ PseudoId CSSSelector::pseudoId(PseudoType type)
case PseudoOutOfRange:
case PseudoUserAgentCustomElement:
case PseudoWebKitCustomElement:
+ case PseudoSeamlessDocument:
#if ENABLE(VIDEO_TRACK)
case PseudoCue:
case PseudoFutureCue:
case PseudoPastCue:
#endif
-#if ENABLE(IFRAME_SEAMLESS)
- case PseudoSeamlessDocument:
-#endif
#if ENABLE(SHADOW_DOM)
case PseudoDistributed:
#endif
@@ -323,6 +321,7 @@ static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap(
DEFINE_STATIC_LOCAL(AtomicString, firstPage, ("first", AtomicString::ConstructFromLiteral));
DEFINE_STATIC_LOCAL(AtomicString, leftPage, ("left", AtomicString::ConstructFromLiteral));
DEFINE_STATIC_LOCAL(AtomicString, rightPage, ("right", AtomicString::ConstructFromLiteral));
+ DEFINE_STATIC_LOCAL(AtomicString, seamlessDocument, ("-webkit-seamless-document", AtomicString::ConstructFromLiteral));
#if ENABLE(FULLSCREEN_API)
DEFINE_STATIC_LOCAL(AtomicString, fullScreen, ("-webkit-full-screen", AtomicString::ConstructFromLiteral));
DEFINE_STATIC_LOCAL(AtomicString, fullScreenDocument, ("-webkit-full-screen-document", AtomicString::ConstructFromLiteral));
@@ -334,9 +333,6 @@ static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap(
DEFINE_STATIC_LOCAL(AtomicString, futureCue, ("future", AtomicString::ConstructFromLiteral));
DEFINE_STATIC_LOCAL(AtomicString, pastCue, ("past", AtomicString::ConstructFromLiteral));
#endif
-#if ENABLE(IFRAME_SEAMLESS)
- DEFINE_STATIC_LOCAL(AtomicString, seamlessDocument, ("-webkit-seamless-document", AtomicString::ConstructFromLiteral));
-#endif
#if ENABLE(SHADOW_DOM)
DEFINE_STATIC_LOCAL(AtomicString, distributed, ("-webkit-distributed(", AtomicString::ConstructFromLiteral));
#endif
@@ -411,6 +407,7 @@ static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap(
nameToPseudoType->set(firstPage.impl(), CSSSelector::PseudoFirstPage);
nameToPseudoType->set(leftPage.impl(), CSSSelector::PseudoLeftPage);
nameToPseudoType->set(rightPage.impl(), CSSSelector::PseudoRightPage);
+ nameToPseudoType->set(seamlessDocument.impl(), CSSSelector::PseudoSeamlessDocument);
#if ENABLE(FULLSCREEN_API)
nameToPseudoType->set(fullScreen.impl(), CSSSelector::PseudoFullScreen);
nameToPseudoType->set(fullScreenDocument.impl(), CSSSelector::PseudoFullScreenDocument);
@@ -422,9 +419,6 @@ static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap(
nameToPseudoType->set(futureCue.impl(), CSSSelector::PseudoFutureCue);
nameToPseudoType->set(pastCue.impl(), CSSSelector::PseudoPastCue);
#endif
-#if ENABLE(IFRAME_SEAMLESS)
- nameToPseudoType->set(seamlessDocument.impl(), CSSSelector::PseudoSeamlessDocument);
-#endif
#if ENABLE(SHADOW_DOM)
nameToPseudoType->set(distributed.impl(), CSSSelector::PseudoDistributed);
#endif
@@ -551,9 +545,7 @@ void CSSSelector::extractPseudoType() const
case PseudoFullScreenAncestor:
case PseudoAnimatingFullScreenTransition:
#endif
-#if ENABLE(IFRAME_SEAMLESS)
case PseudoSeamlessDocument:
-#endif
case PseudoInRange:
case PseudoOutOfRange:
#if ENABLE(VIDEO_TRACK)

Powered by Google App Engine
This is Rietveld 408576698