Changeset 90966 in webkit

Timestamp:

Jul 13, 2011 5:29:55 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[CSSRegions] Parse -webkit-content-order property
​https://bugs.webkit.org/show_bug.cgi?id=63897

Patch by Mihnea Ovidenie <​mihnea@adobe.com> on 2011-07-13
Reviewed by David Hyatt.

Source/WebCore:

Test: fast/regions/webkit-content-order-parsing.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

• css/CSSPropertyNames.in:
• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

• rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::regionIndex):
(WebCore::InheritedFlags::setRegionIndex):
(WebCore::InheritedFlags::initialRegionIndex):

• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

• rendering/style/StyleRareNonInheritedData.h:

LayoutTests:

• fast/regions/script-tests/webkit-content-order-parsing.js: Added.
• fast/regions/webkit-content-order-parsing-expected.txt: Added.
• fast/regions/webkit-content-order-parsing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/script-tests/webkit-content-order-parsing.js (added)
• LayoutTests/fast/regions/webkit-content-order-parsing-expected.txt (added)
• LayoutTests/fast/regions/webkit-content-order-parsing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)
• Source/WebCore/css/CSSPropertyNames.in (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (3 diffs)
• Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (modified) (3 diffs)
• Source/WebCore/rendering/style/StyleRareNonInheritedData.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-13  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Parse -webkit-content-order property
+        https://bugs.webkit.org/show_bug.cgi?id=63897
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/script-tests/webkit-content-order-parsing.js: Added.
+        * fast/regions/webkit-content-order-parsing-expected.txt: Added.
+        * fast/regions/webkit-content-order-parsing.html: Added.
+
 2011-07-13  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-13  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Parse -webkit-content-order property
+        https://bugs.webkit.org/show_bug.cgi?id=63897
+
+        Reviewed by David Hyatt.
+
+        Test: fast/regions/webkit-content-order-parsing.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/CSSPropertyNames.in:
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::regionIndex):
+        (WebCore::InheritedFlags::setRegionIndex):
+        (WebCore::InheritedFlags::initialRegionIndex):
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator==):
+        * rendering/style/StyleRareNonInheritedData.h:
+
 2011-07-13  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -249 +249 @@
 #if ENABLE(CSS_REGIONS)
     , CSSPropertyWebkitFlow
+    , CSSPropertyWebkitContentOrder
 #endif
 #if ENABLE(SVG)
@@ -1668 +1669 @@
                 return primitiveValueCache->createIdentifierValue(CSSValueAuto);
             return primitiveValueCache->createValue(style->flowThread(), CSSPrimitiveValue::CSS_STRING);
+        case CSSPropertyWebkitContentOrder:
+            return primitiveValueCache->createValue(style->regionIndex(), CSSPrimitiveValue::CSS_NUMBER);
 #endif
         /* Shorthand properties, currently not supported see bug 13658*/

trunk/Source/WebCore/css/CSSParser.cpp

@@ -1592 +1592 @@
     case CSSPropertyWebkitFlow:
         return parseFlowThread(propId, important);
+    case CSSPropertyWebkitContentOrder:
+        validPrimitive = validUnit(value, FInteger, m_strict);
+        break;
 #endif
     case CSSPropertyWebkitUserDrag: // auto | none | element

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -329 +329 @@
 #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
 -webkit-flow
+-webkit-content-order
 #endif
 #if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4892 +4892 @@
         else
             m_style->setFlowThread(primitiveValue->getStringValue());
+        return;
+    case CSSPropertyWebkitContentOrder:
+        HANDLE_INHERIT_AND_INITIAL(regionIndex, RegionIndex);
+        m_style->setRegionIndex(clampToInteger(primitiveValue->getDoubleValue()));
         return;
 #endif

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -348 +348 @@
 #if ENABLE(CSS_REGIONS)
         if (rareNonInheritedData->m_flowThread != other->rareNonInheritedData->m_flowThread
-            || rareNonInheritedData->m_regionThread != other->rareNonInheritedData->m_regionThread)
+            || rareNonInheritedData->m_regionThread != other->rareNonInheritedData->m_regionThread
+            || rareNonInheritedData->m_regionIndex != other->rareNonInheritedData->m_regionIndex)
             return StyleDifferenceLayout;
 #endif

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -747 +747 @@
     const AtomicString& flowThread() const { return rareNonInheritedData->m_flowThread; }
     const AtomicString& regionThread() const { return rareNonInheritedData->m_regionThread; }
+    int regionIndex() const { return rareNonInheritedData->m_regionIndex; }
 #endif
 
@@ -1100 +1101 @@
     void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInheritedData, m_flowThread, flowThread); }
     void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
+    void setRegionIndex(int regionIndex) { SET_VAR(rareNonInheritedData, m_regionIndex, regionIndex); }
 #endif
 
@@ -1344 +1346 @@
     static const AtomicString& initialFlowThread() { return nullAtom; }
     static const AtomicString& initialRegionThread() { return nullAtom; }
+    static int initialRegionIndex() { return 0; }
 #endif
 

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

@@ -59 +59 @@
     , m_flowThread(RenderStyle::initialFlowThread())
     , m_regionThread(RenderStyle::initialRegionThread())
+    , m_regionIndex(RenderStyle::initialRegionIndex())
 #endif
 #if ENABLE(CSS_EXCLUSIONS)
@@ -105 +106 @@
     , m_flowThread(o.m_flowThread)
     , m_regionThread(o.m_regionThread)
+    , m_regionIndex(o.m_regionIndex)
 #endif
 #if ENABLE(CSS_EXCLUSIONS)
@@ -158 +160 @@
         && (m_flowThread == o.m_flowThread)
         && (m_regionThread == o.m_regionThread)
+        && (m_regionIndex == o.m_regionIndex)
 #endif
 #if ENABLE(CSS_EXCLUSIONS)

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

@@ -136 +136 @@
     AtomicString m_flowThread;
     AtomicString m_regionThread;
+    int m_regionIndex;
 #endif