Changeset 58385 in webkit

Timestamp:

Apr 28, 2010 12:09:09 AM (14 years ago)

Author:

yuzo@google.com

Message:

2010-04-27 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Eric Seidel.

Enhance CSS parser for Paged Media (Iteration 4)
Implement page property parsing as specified at ​http://dev.w3.org/csswg/css3-page/#using-named-pages.
​https://bugs.webkit.org/show_bug.cgi?id=35853

• printing/page-rule-css-text-expected.txt:
• printing/page-rule-css-text.html:

2010-04-27 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Eric Seidel.

Enhance CSS parser for Paged Media (Iteration 4)
Implement page property parsing as specified at ​http://dev.w3.org/csswg/css3-page/#using-named-pages.
​https://bugs.webkit.org/show_bug.cgi?id=35853

• css/CSSParser.cpp: (WebCore::CSSParser::parseValue): (WebCore::CSSParser::parsePage):
• css/CSSParser.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/page-rule-css-text-expected.txt (modified) (1 diff)
• LayoutTests/printing/page-rule-css-text.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (2 diffs)
• WebCore/css/CSSParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-27  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Enhance CSS parser for Paged Media (Iteration 4)
+        Implement page property parsing as specified at http://dev.w3.org/csswg/css3-page/#using-named-pages.
+        https://bugs.webkit.org/show_bug.cgi?id=35853
+
+        * printing/page-rule-css-text-expected.txt:
+        * printing/page-rule-css-text.html:
+
 2010-04-27  Yuzo Fujishima  <yuzo@google.com>
 

trunk/LayoutTests/printing/page-rule-css-text-expected.txt

@@ -18 +18 @@
 @page err_orientations { }
 @page err_too_many_params { }
+table { page: Rotated; }
+div { page: auto; }
+pre { }
+p { }
 

trunk/LayoutTests/printing/page-rule-css-text.html

@@ -64 +64 @@
 }
 
+table {
+    page: Rotated;
+}
+div {
+    page: Auto;
+}
+pre {
+    page: Auto Rotated; /* Invalid */
+}
+p {
+    page: 1cm; /* Invalid */
+}
+
 /* FIXME: Add the following once margin at-rule is implemented.
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-27  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Enhance CSS parser for Paged Media (Iteration 4)
+        Implement page property parsing as specified at http://dev.w3.org/csswg/css3-page/#using-named-pages.
+        https://bugs.webkit.org/show_bug.cgi?id=35853
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parsePage):
+        * css/CSSParser.h:
+
 2010-04-27  Yuzo Fujishima  <yuzo@google.com>
 

trunk/WebCore/css/CSSParser.cpp

@@ -1695 +1695 @@
     case CSSPropertyInvalid:
         return false;
+    case CSSPropertyPage:
+        return parsePage(propId, important);
     case CSSPropertyFontStretch:
-    case CSSPropertyPage:
     case CSSPropertyTextLineThrough:
     case CSSPropertyTextOverline:
@@ -2111 +2112 @@
     
     return true;
+}
+
+// auto | <identifier>
+bool CSSParser::parsePage(int propId, bool important)
+{
+    ASSERT(propId == CSSPropertyPage);
+
+    if (m_valueList->size() != 1)
+        return false;
+
+    CSSParserValue* value = m_valueList->current();
+    if (!value)
+        return false;
+
+    if (value->id == CSSValueAuto) {
+        addProperty(propId, CSSPrimitiveValue::createIdentifier(value->id), important);
+        return true;
+    } else if (value->id == 0 && value->unit == CSSPrimitiveValue::CSS_IDENT) {
+        addProperty(propId, CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_STRING), important);
+        return true;
+    }
+    return false;
 }
 

trunk/WebCore/css/CSSParser.h

@@ -261 +261 @@
         };
 
+        bool parsePage(int propId, bool important);
         bool parseSize(int propId, bool important);
         SizeParameterType parseSizeParameter(CSSValueList* parsedValues, CSSParserValue* value, SizeParameterType prevParamType);