Changeset 90642 in webkit

Timestamp:

Jul 8, 2011 10:29:10 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[CSSRegions]Parse content: -webkit-from-flow
​https://bugs.webkit.org/show_bug.cgi?id=63133

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

Source/WebCore:

Test: fast/regions/content-webkit-from-flow-parsing.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::contentToCSSValue):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseContent):
(WebCore::CSSParser::parseFromFlowContent):

• css/CSSParser.h:
• css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::cleanup):
(WebCore::CSSPrimitiveValue::getStringValue):
(WebCore::CSSPrimitiveValue::cssText):

• css/CSSPrimitiveValue.h:
• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

• rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::regionThread):
(WebCore::InheritedFlags::setRegionThread):
(WebCore::InheritedFlags::initialRegionThread):

• rendering/style/StyleRareNonInheritedData.cpp:

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

• rendering/style/StyleRareNonInheritedData.h:

LayoutTests:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/content-webkit-from-flow-parsing-expected.txt (added)
• LayoutTests/fast/regions/content-webkit-from-flow-parsing.html (added)
• LayoutTests/fast/regions/script-tests/content-webkit-from-flow-parsing.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSParser.h (modified) (1 diff)
• Source/WebCore/css/CSSPrimitiveValue.cpp (modified) (3 diffs)
• Source/WebCore/css/CSSPrimitiveValue.h (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (2 diffs)
• 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-08  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Parse content: -webkit-from-flow
+        https://bugs.webkit.org/show_bug.cgi?id=63133
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/content-webkit-from-flow-parsing-expected.txt: Added.
+        * fast/regions/content-webkit-from-flow-parsing.html: Added.
+        * fast/regions/script-tests/content-webkit-from-flow-parsing.js: Added.
+
 2011-07-08  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-08  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Parse content: -webkit-from-flow
+        https://bugs.webkit.org/show_bug.cgi?id=63133
+
+        Reviewed by David Hyatt.
+
+        Test: fast/regions/content-webkit-from-flow-parsing.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::contentToCSSValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseContent):
+        (WebCore::CSSParser::parseFromFlowContent):
+        * css/CSSParser.h:
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::cleanup):
+        (WebCore::CSSPrimitiveValue::getStringValue):
+        (WebCore::CSSPrimitiveValue::cssText):
+        * css/CSSPrimitiveValue.h:
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::regionThread):
+        (WebCore::InheritedFlags::setRegionThread):
+        (WebCore::InheritedFlags::initialRegionThread):
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator==):
+        * rendering/style/StyleRareNonInheritedData.h:
+
 2011-07-08  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -768 +768 @@
             list->append(primitiveValueCache->createValue(static_cast<const TextContentData*>(contentData)->text(), CSSPrimitiveValue::CSS_STRING));
     }
+#if ENABLE(CSS_REGIONS)
+    if (!style->regionThread().isNull())
+        list->append(primitiveValueCache->createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING));
+#endif
     return list.release();
 }

trunk/Source/WebCore/css/CSSParser.cpp

@@ -2658 +2658 @@
                 if (!parseGeneratedImage(parsedValue))
                     return false;
+#if ENABLE(CSS_REGIONS)
+            } else if (equalIgnoringCase(val->function->name, "-webkit-from-flow(")) {
+                parsedValue = parseFromFlowContent(args);
+                if (!parsedValue)
+                    return false;
+#endif
             } else
                 return false;
@@ -5866 +5872 @@
     return false;
 }
+
+// The region name is now specified as an argument to the content property:
+// content: from-flow(flow_thread_name)
+PassRefPtr<CSSValue> CSSParser::parseFromFlowContent(CSSParserValueList* args)
+{
+    // It should be only one name for the region thread.
+    if (args->size() != 1)
+        return 0;
+
+    CSSParserValue* argFlowThreadName = args->current();
+
+    if (argFlowThreadName->unit != CSSPrimitiveValue::CSS_STRING)
+        return 0;
+
+    return CSSPrimitiveValue::create(argFlowThreadName->string, CSSPrimitiveValue::CSS_FROM_FLOW);
+}
 #endif
 

trunk/Source/WebCore/css/CSSParser.h

@@ -159 +159 @@
 #if ENABLE(CSS_REGIONS)
         bool parseFlowThread(int propId, bool important);
+        PassRefPtr<CSSValue> parseFromFlowContent(CSSParserValueList*);
 #endif
         // CSS3 Parsing Routines (for properties specific to CSS3)

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -222 +222 @@
         case CSS_URI:
         case CSS_ATTR:
+#if ENABLE(CSS_REGIONS)
+        case CSS_FROM_FLOW:
+#endif
         case CSS_PARSER_HEXCOLOR:
             if (m_value.string)
@@ -505 +508 @@
         case CSS_ATTR:
         case CSS_URI:
+#if ENABLE(CSS_REGIONS)
+        case CSS_FROM_FLOW:
+#endif
             return m_value.string;
         case CSS_IDENT:
@@ -685 +691 @@
             text = quoteCSSStringIfNeeded(m_value.string);
             break;
+#if ENABLE(CSS_REGIONS)
+        case CSS_FROM_FLOW:
+            text = "-webkit-from-flow(" + quoteCSSStringIfNeeded(m_value.string) + ")";
+            break;
+#endif
         case CSS_URI:
             text = "url(" + quoteCSSURLIfNeeded(m_value.string) + ")";

trunk/Source/WebCore/css/CSSPrimitiveValue.h

@@ -95 +95 @@
 
         // This is used internally for counter names (as opposed to counter values)
-        CSS_COUNTER_NAME = 109
+        CSS_COUNTER_NAME = 109,
+        CSS_FROM_FLOW = 110
     };
     

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4141 +4141 @@
         int len = list->length();
 
+#if ENABLE(CSS_REGIONS)
+        if (len == 1 && list->itemWithoutBoundsCheck(0)->isPrimitiveValue()) {
+            CSSPrimitiveValue* contentValue = static_cast<CSSPrimitiveValue*>(list->itemWithoutBoundsCheck(0));
+            if (contentValue->primitiveType() == CSSPrimitiveValue::CSS_FROM_FLOW) {
+                m_style->setRegionThread(contentValue->getStringValue().impl());
+                return;
+            }
+        }
+#endif
+
         bool didSet = false;
         for (int i = 0; i < len; i++) {
@@ -4148 +4158 @@
                 didSet = true;
             }
-            
+
             if (!item->isPrimitiveValue())
                 continue;
-            
+
             CSSPrimitiveValue* contentValue = static_cast<CSSPrimitiveValue*>(item);
             switch (contentValue->primitiveType()) {

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

@@ -346 +346 @@
 
 #if ENABLE(CSS_REGIONS)
-        if (rareNonInheritedData->m_flowThread != other->rareNonInheritedData->m_flowThread)
-             return StyleDifferenceLayout;
+        if (rareNonInheritedData->m_flowThread != other->rareNonInheritedData->m_flowThread
+            || rareNonInheritedData->m_regionThread != other->rareNonInheritedData->m_regionThread)
+            return StyleDifferenceLayout;
 #endif
         if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNonInheritedData->m_deprecatedFlexibleBox.get()

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

@@ -746 +746 @@
 #if ENABLE(CSS_REGIONS)
     const AtomicString& flowThread() const { return rareNonInheritedData->m_flowThread; }
+    const AtomicString& regionThread() const { return rareNonInheritedData->m_regionThread; }
 #endif
 
@@ -1098 +1099 @@
 #if ENABLE(CSS_REGIONS)
     void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInheritedData, m_flowThread, flowThread); }
+    void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
 #endif
 
@@ -1331 +1333 @@
 #if ENABLE(CSS_REGIONS)
     static const AtomicString& initialFlowThread() { return nullAtom; }
+    static const AtomicString& initialRegionThread() { return nullAtom; }
 #endif
 

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

@@ -58 +58 @@
 #if ENABLE(CSS_REGIONS)
     , m_flowThread(RenderStyle::initialFlowThread())
+    , m_regionThread(RenderStyle::initialRegionThread())
 #endif
 {
@@ -100 +101 @@
 #if ENABLE(CSS_REGIONS)
     , m_flowThread(o.m_flowThread)
+    , m_regionThread(o.m_regionThread)
 #endif
 {
@@ -149 +151 @@
 #if ENABLE(CSS_REGIONS)
         && (m_flowThread == o.m_flowThread)
+        && (m_regionThread == o.m_regionThread)
 #endif
         ;

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

@@ -134 +134 @@
 #if ENABLE(CSS_REGIONS)
     AtomicString m_flowThread;
+    AtomicString m_regionThread;
 #endif