Remove position:sticky runtime flag

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

Reviewed by Simon Fraser.

Rollout of r128663

No new tests are necessary because there is no behavior change.

* css/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext):
(WebCore::operator==):
(WebCore::isValidKeywordPropertyAndValue):
* css/CSSParserMode.h:
* dom/Document.cpp:
* dom/Document.h:
* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/Settings.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 621494be0f9ccd1dc7057f4c4ec9214cd0344a37..7c0f21eb5b1687ffd96d27ed1df2e0e66bdff7aa 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2014-02-13  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Remove position:sticky runtime flag
+        https://bugs.webkit.org/show_bug.cgi?id=128774
+
+        Reviewed by Simon Fraser.
+
+        Rollout of r128663
+
+        No new tests are necessary because there is no behavior change.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParserContext::CSSParserContext):
+        (WebCore::operator==):
+        (WebCore::isValidKeywordPropertyAndValue):
+        * css/CSSParserMode.h:
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+
 2014-02-04  Gustavo Noronha Silva  <gns@gnome.org>
 
         [GTK][CMake] Generate GObject DOM bindings .symbols files

diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index 819865b85bf236875a66eb00c46c7ddb5550804e..40d976d41b3f5cb4947aa5d214c673b7b109aeed 100644 (file)
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -245,7 +245,6 @@ CSSParserContext::CSSParserContext(CSSParserMode mode, const URL& baseURL)
     : baseURL(baseURL)
     , mode(mode)
     , isHTMLDocument(false)
-    , isCSSStickyPositionEnabled(false)
     , isCSSRegionsEnabled(false)
     , isCSSCompositingEnabled(false)
     , isCSSGridLayoutEnabled(false)
@@ -266,7 +265,6 @@ CSSParserContext::CSSParserContext(Document& document, const URL& baseURL, const
     , charset(charset)
     , mode(document.inQuirksMode() ? CSSQuirksMode : CSSStrictMode)
     , isHTMLDocument(document.isHTMLDocument())
-    , isCSSStickyPositionEnabled(document.cssStickyPositionEnabled())
     , isCSSRegionsEnabled(document.cssRegionsEnabled())
     , isCSSCompositingEnabled(document.cssCompositingEnabled())
     , isCSSGridLayoutEnabled(document.cssGridLayoutEnabled())
@@ -288,7 +286,6 @@ bool operator==(const CSSParserContext& a, const CSSParserContext& b)
         && a.charset == b.charset
         && a.mode == b.mode
         && a.isHTMLDocument == b.isHTMLDocument
-        && a.isCSSStickyPositionEnabled == b.isCSSStickyPositionEnabled
         && a.isCSSRegionsEnabled == b.isCSSRegionsEnabled
         && a.isCSSCompositingEnabled == b.isCSSCompositingEnabled
         && a.isCSSGridLayoutEnabled == b.isCSSGridLayoutEnabled
@@ -751,7 +748,7 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
     case CSSPropertyPosition: // static | relative | absolute | fixed | sticky | inherit
         if (valueID == CSSValueStatic || valueID == CSSValueRelative || valueID == CSSValueAbsolute || valueID == CSSValueFixed
 #if ENABLE(CSS_STICKY_POSITION)
-            || (parserContext.isCSSStickyPositionEnabled && valueID == CSSValueWebkitSticky)
+            || valueID == CSSValueWebkitSticky
 #endif
             )
             return true;

diff --git a/Source/WebCore/css/CSSParserMode.h b/Source/WebCore/css/CSSParserMode.h
index 02e0529f1d1565861fc8e6048270b778926dcac1..a53a8f957b6ac843d5a0ce1954fcaf224ebda0ea 100644 (file)
--- a/Source/WebCore/css/CSSParserMode.h
+++ b/Source/WebCore/css/CSSParserMode.h
@@ -64,7 +64,6 @@ public:
     String charset;
     CSSParserMode mode;
     bool isHTMLDocument;
-    bool isCSSStickyPositionEnabled;
     bool isCSSRegionsEnabled;
     bool isCSSCompositingEnabled;
     bool isCSSGridLayoutEnabled;

diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index ad7407c0f211007453e4435534b1b9b43e03fcf7..75ef433c02b1b7d3468dc531b3360209aad375d8 100644 (file)
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -1082,11 +1082,6 @@ bool Document::regionBasedColumnsEnabled() const
     return settings() && settings()->regionBasedColumnsEnabled(); 
 }
 
-bool Document::cssStickyPositionEnabled() const
-{
-    return settings() && settings()->cssStickyPositionEnabled(); 
-}
-
 bool Document::cssRegionsEnabled() const
 {
     return RuntimeEnabledFeatures::sharedFeatures().cssRegionsEnabled(); 

diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
index 65757ce1cf64d37374106cb6f896f133e25b17bf..ffa38676f68a76e3fea058365b73e13707876c4e 100644 (file)
--- a/Source/WebCore/dom/Document.h
+++ b/Source/WebCore/dom/Document.h
@@ -394,7 +394,6 @@ public:
     PassRefPtr<Element> createElementNS(const String& namespaceURI, const String& qualifiedName, ExceptionCode&);
     PassRefPtr<Element> createElement(const QualifiedName&, bool createdByParser);
 
-    bool cssStickyPositionEnabled() const;
     bool cssRegionsEnabled() const;
     bool cssCompositingEnabled() const;
 #if ENABLE(CSS_REGIONS)

diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index 3c592610d6b2e9e8567d91857e9016c87f124ac9..38bd5e19a51d099fa5e7882a9d187ad8e343cc88 100644 (file)
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -188,9 +188,6 @@ Settings::Settings(Page* page)
     , m_shouldDispatchJavaScriptWindowOnErrorEvents(false)
     , m_alwaysUseBaselineOfPrimaryFont(false)
     , m_alwaysUseAcceleratedOverflowScroll(false)
-#endif
-#if ENABLE(CSS_STICKY_POSITION)
-    , m_cssStickyPositionEnabled(true)
 #endif
     , m_showTiledScrollingIndicator(false)
     , m_tiledBackingStoreEnabled(false)

diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h
index 084ba69f4f41834b6e0b5cb6fb4284be4602d89b..5738139187973ee5ce1535cf61b35069e785b19e 100644 (file)
--- a/Source/WebCore/page/Settings.h
+++ b/Source/WebCore/page/Settings.h
@@ -212,14 +212,6 @@ public:
     void setFontRenderingMode(FontRenderingMode mode);
     FontRenderingMode fontRenderingMode() const;
 
-#if ENABLE(CSS_STICKY_POSITION)
-    void setCSSStickyPositionEnabled(bool enabled) { m_cssStickyPositionEnabled = enabled; }
-    bool cssStickyPositionEnabled() const { return m_cssStickyPositionEnabled; }
-#else
-    void setCSSStickyPositionEnabled(bool) { }
-    bool cssStickyPositionEnabled() const { return false; }
-#endif
-
     void setShowTiledScrollingIndicator(bool);
     bool showTiledScrollingIndicator() const { return m_showTiledScrollingIndicator; }
 
@@ -352,9 +344,6 @@ private:
     bool m_alwaysUseBaselineOfPrimaryFont : 1;
     bool m_allowMultiElementImplicitFormSubmission : 1;
     bool m_alwaysUseAcceleratedOverflowScroll : 1;
-#endif
-#if ENABLE(CSS_STICKY_POSITION)
-    bool m_cssStickyPositionEnabled : 1;
 #endif
     bool m_showTiledScrollingIndicator : 1;
     bool m_tiledBackingStoreEnabled : 1;