Changeset 67695 in webkit

Timestamp:

Sep 16, 2010 11:20:48 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-09-16 takano takumi <​takano1@asia.apple.com>

Reviewed by Kent Tamura.

​https://bugs.webkit.org/show_bug.cgi?id=45020
Support "block-flow" and "writing-mode": interpret properties into RenderStyle

Fixed a regression in SVG test introduced by my previous change.

• css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::operator EWritingMode):
• css/SVGCSSParser.cpp: (WebCore::CSSParser::parseSVGValue):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPrimitiveValueMappings.h (modified) (1 diff)
• css/SVGCSSParser.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-16  takano takumi  <takano1@asia.apple.com>
+
+        Reviewed by Kent Tamura.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45020
+        Support "block-flow" and "writing-mode": interpret properties into RenderStyle
+
+        Fixed a regression in SVG test introduced by my previous change.
+
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::operator EWritingMode):
+        * css/SVGCSSParser.cpp:
+        (WebCore::CSSParser::parseSVGValue):
+
 2010-09-16  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/css/CSSPrimitiveValueMappings.h

@@ -2685 +2685 @@
 template<> inline CSSPrimitiveValue::operator EWritingMode() const
 {
-    return static_cast<EWritingMode>(m_value.ident - CSSValueLrTb);
+    switch (m_value.ident) {
+    case CSSValueLrTb:
+        return WM_LRTB;
+    case CSSValueLr:
+        return WM_LR;
+    case CSSValueRlTb:
+        return WM_RLTB;
+    case CSSValueRl:
+        return WM_RL;
+    case CSSValueTbRl:
+        return WM_TBRL;
+    case CSSValueTb:
+        return WM_TB;
+    default:
+        ASSERT_NOT_REACHED();
+        return WM_LRTB;
+    }
 }
 

trunk/WebCore/css/SVGCSSParser.cpp

@@ -233 +233 @@
     case CSSPropertyWritingMode:
     // lr-tb | rl_tb | tb-rl | lr | rl | tb | inherit
-        if (id >= CSSValueLrTb && id <= CSSValueTb)
+        if (id == CSSValueLrTb || id == CSSValueRlTb || id == CSSValueTbRl || id == CSSValueLr || id == CSSValueRl || id == CSSValueTb)
             valid_primitive = true;
         break;