Changeset 58385 in webkit
- Timestamp:
- Apr 28, 2010 12:09:09 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r58384 r58385 1 2010-04-27 Yuzo Fujishima <yuzo@google.com> 2 3 Reviewed by Eric Seidel. 4 5 Enhance CSS parser for Paged Media (Iteration 4) 6 Implement page property parsing as specified at http://dev.w3.org/csswg/css3-page/#using-named-pages. 7 https://bugs.webkit.org/show_bug.cgi?id=35853 8 9 * printing/page-rule-css-text-expected.txt: 10 * printing/page-rule-css-text.html: 11 1 12 2010-04-27 Yuzo Fujishima <yuzo@google.com> 2 13 -
trunk/LayoutTests/printing/page-rule-css-text-expected.txt
r58384 r58385 18 18 @page err_orientations { } 19 19 @page err_too_many_params { } 20 table { page: Rotated; } 21 div { page: auto; } 22 pre { } 23 p { } 20 24 -
trunk/LayoutTests/printing/page-rule-css-text.html
r58384 r58385 64 64 } 65 65 66 table { 67 page: Rotated; 68 } 69 div { 70 page: Auto; 71 } 72 pre { 73 page: Auto Rotated; /* Invalid */ 74 } 75 p { 76 page: 1cm; /* Invalid */ 77 } 78 66 79 /* FIXME: Add the following once margin at-rule is implemented. 67 80 -
trunk/WebCore/ChangeLog
r58384 r58385 1 2010-04-27 Yuzo Fujishima <yuzo@google.com> 2 3 Reviewed by Eric Seidel. 4 5 Enhance CSS parser for Paged Media (Iteration 4) 6 Implement page property parsing as specified at http://dev.w3.org/csswg/css3-page/#using-named-pages. 7 https://bugs.webkit.org/show_bug.cgi?id=35853 8 9 * css/CSSParser.cpp: 10 (WebCore::CSSParser::parseValue): 11 (WebCore::CSSParser::parsePage): 12 * css/CSSParser.h: 13 1 14 2010-04-27 Yuzo Fujishima <yuzo@google.com> 2 15 -
trunk/WebCore/css/CSSParser.cpp
r58384 r58385 1695 1695 case CSSPropertyInvalid: 1696 1696 return false; 1697 case CSSPropertyPage: 1698 return parsePage(propId, important); 1697 1699 case CSSPropertyFontStretch: 1698 case CSSPropertyPage:1699 1700 case CSSPropertyTextLineThrough: 1700 1701 case CSSPropertyTextOverline: … … 2111 2112 2112 2113 return true; 2114 } 2115 2116 // auto | <identifier> 2117 bool CSSParser::parsePage(int propId, bool important) 2118 { 2119 ASSERT(propId == CSSPropertyPage); 2120 2121 if (m_valueList->size() != 1) 2122 return false; 2123 2124 CSSParserValue* value = m_valueList->current(); 2125 if (!value) 2126 return false; 2127 2128 if (value->id == CSSValueAuto) { 2129 addProperty(propId, CSSPrimitiveValue::createIdentifier(value->id), important); 2130 return true; 2131 } else if (value->id == 0 && value->unit == CSSPrimitiveValue::CSS_IDENT) { 2132 addProperty(propId, CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_STRING), important); 2133 return true; 2134 } 2135 return false; 2113 2136 } 2114 2137 -
trunk/WebCore/css/CSSParser.h
r58384 r58385 261 261 }; 262 262 263 bool parsePage(int propId, bool important); 263 264 bool parseSize(int propId, bool important); 264 265 SizeParameterType parseSizeParameter(CSSValueList* parsedValues, CSSParserValue* value, SizeParameterType prevParamType);
Note: See TracChangeset
for help on using the changeset viewer.