Changeset 100338 in webkit
- Timestamp:
- Nov 15, 2011 3:05:28 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r100337 r100338 1 2011-11-15 Julien Chaffraix <jchaffraix@webkit.org> 2 3 Add the needed plumbing to parse display: -webkit-grid 4 https://bugs.webkit.org/show_bug.cgi?id=72331 5 6 Reviewed by Tony Chang. 7 8 * fast/css-grid-layout/display-grid-set-get-expected.txt: Added. 9 * fast/css-grid-layout/display-grid-set-get.html: Added. 10 * fast/css-grid-layout/resources/display-grid-set-get.js: Added. 11 Test that setting the display to -webkit-grid (from JS or CSS) works 12 and we get the right value back. 13 14 * platform/chromium/test_expectations.txt: 15 * platform/efl/Skipped: 16 * platform/gtk/Skipped: 17 * platform/mac/Skipped: 18 * platform/qt/Skipped: 19 * platform/win/Skipped: 20 * platform/wincairo/Skipped: 21 SKIP the css-grid-layout tests on all platforms for now. 22 1 23 2011-11-15 James Robinson <jamesr@chromium.org> 2 24 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r100325 r100338 3271 3271 BUGCR85293 LINUX : svg/text/foreignObject-text-clipping-bug.xml = PASS IMAGE 3272 3272 3273 // CSS Grid Layout is not enabled yet. 3274 BUGWK60731 SKIP : fast/css-grid-layout = PASS 3275 3273 3276 // Need to evaluate and update regions and exclusions tests. 3274 3277 BUGWK57312 : fast/regions = PASS FAIL MISSING -
trunk/LayoutTests/platform/efl/Skipped
r100292 r100338 1890 1890 # ------------------------------------ 1891 1891 1892 # CSS Grid Layout is not yet enabled. http://webkit.org/b/60731 1893 fast/css-grid-layout 1894 1892 1895 # CSS Filters support not yet enabled (needs ENABLE_CSS_FILTERS). 1893 1896 # https://bugs.webkit.org/show_bug.cgi?id=68469 -
trunk/LayoutTests/platform/gtk/Skipped
r100292 r100338 343 343 http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html 344 344 http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html 345 346 # CSS Grid Layout is not yet enabled. http://webkit.org/b/60731 347 fast/css-grid-layout 345 348 346 349 # CSS Regions support not yet enabled. http://webkit.org/b/57312 -
trunk/LayoutTests/platform/mac/Skipped
r100292 r100338 401 401 webarchive/loading/mainresource-null-mimetype-crash.html 402 402 403 # CSS Grid Layout is not yet enabled. http://webkit.org/b/60731 404 fast/css-grid-layout 405 403 406 # JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540) 404 407 http/tests/security/isolatedWorld/cross-origin-xhr.html -
trunk/LayoutTests/platform/qt/Skipped
r100292 r100338 155 155 svg/custom/manually-parsed-svg-disallowed-in-dashboard.html 156 156 svg/custom/svg-disallowed-in-dashboard-object.html 157 158 # CSS Grid Layout is not yet enabled. http://webkit.org/b/60731 159 fast/css-grid-layout 157 160 158 161 # CSS Regions support not yet enabled. http://webkit.org/b/57312 -
trunk/LayoutTests/platform/win/Skipped
r100292 r100338 1385 1385 fast/dom/HTMLAnchorElement/anchor-download-unset.html 1386 1386 1387 # CSS Grid Layout is not yet enabled. http://webkit.org/b/60731 1388 fast/css-grid-layout 1389 1387 1390 # CSS Regions support not yet enabled. http://webkit.org/b/57312 1388 1391 fast/regions -
trunk/LayoutTests/platform/wincairo/Skipped
r100292 r100338 1902 1902 fast/dom/HTMLAnchorElement/anchor-download-unset.html 1903 1903 1904 # CSS Grid Layout is not yet enabled. http://webkit.org/b/60731 1905 fast/css-grid-layout 1906 1904 1907 # CSS Regions support not yet enabled. http://webkit.org/b/57312 1905 1908 fast/regions -
trunk/Source/WebCore/ChangeLog
r100328 r100338 1 2011-11-15 Julien Chaffraix <jchaffraix@webkit.org> 2 3 Add the needed plumbing to parse display: -webkit-grid 4 https://bugs.webkit.org/show_bug.cgi?id=72331 5 6 Reviewed by Tony Chang. 7 8 Test: fast/css-grid-layout/display-grid-set-get.html 9 10 Added parsing support for display: -webkit-grid. From a rendering perspective, 11 the value is equivalent to display: none until we properly implement it. 12 13 * css/CSSParser.cpp: 14 (WebCore::CSSParser::parseValue): 15 * css/CSSPrimitiveValueMappings.h: 16 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): 17 * css/CSSValueKeywords.in: 18 * rendering/style/RenderStyleConstants.h: 19 Added the new CSS value and plumbed the parsing and style application of 20 the new value. 21 22 * css/CSSPrimitiveValueMappings.h: 23 (WebCore::CSSPrimitiveValue::operator EDisplay): 24 Added an ASSERT here as I bumped into some non-trivial issues due to bug 72296. 25 -wap-marquee was offsetting the new value and was wrongly casted by the CSSPrimitiveValueMapping 26 logic outside the EDisplay range which would lead to crashes. 27 28 * rendering/RenderObject.cpp: 29 (WebCore::RenderObject::createObject): 30 Fixed the indentation to follow our coding rules. 31 1 32 2011-11-15 Vincent Scheib <scheib@chromium.org> 2 33 -
trunk/Source/WebCore/css/CSSParser.cpp
r100273 r100338 991 991 if ((id >= CSSValueInline && id <= CSSValueWebkitInlineFlexbox) || id == CSSValueNone) 992 992 validPrimitive = true; 993 #if ENABLE(CSS_GRID_LAYOUT) 994 if (id == CSSValueWebkitGrid) 995 validPrimitive = true; 996 #endif 993 997 break; 994 998 -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r100198 r100338 1067 1067 m_value.ident = CSSValueWebkitInlineFlexbox; 1068 1068 break; 1069 #if ENABLE(CSS_GRID_LAYOUT) 1070 case GRID: 1071 m_value.ident = CSSValueWebkitGrid; 1072 break; 1073 #endif 1069 1074 case NONE: 1070 1075 m_value.ident = CSSValueNone; … … 1077 1082 if (m_value.ident == CSSValueNone) 1078 1083 return NONE; 1079 return static_cast<EDisplay>(m_value.ident - CSSValueInline); 1084 1085 EDisplay display = static_cast<EDisplay>(m_value.ident - CSSValueInline); 1086 ASSERT(display >= INLINE && display <= NONE); 1087 return display; 1080 1088 } 1081 1089 -
trunk/Source/WebCore/css/CSSValueKeywords.in
r100187 r100338 327 327 -webkit-flexbox 328 328 -webkit-inline-flexbox 329 #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT 330 -webkit-grid 331 #endif 329 332 //none 330 333 // -
trunk/Source/WebCore/rendering/RenderObject.cpp
r100198 r100338 131 131 132 132 switch (style->display()) { 133 case NONE: 134 return 0; 135 case INLINE: 136 return new (arena) RenderInline(node); 137 case BLOCK: 138 case INLINE_BLOCK: 139 case RUN_IN: 140 case COMPACT: 141 // Only non-replaced block elements can become a region. 142 if (!style->regionThread().isEmpty() && doc->renderView()) 143 return new (arena) RenderRegion(node, doc->renderView()->renderFlowThreadWithName(style->regionThread())); 144 return new (arena) RenderBlock(node); 145 case LIST_ITEM: 146 return new (arena) RenderListItem(node); 147 case TABLE: 148 case INLINE_TABLE: 149 return new (arena) RenderTable(node); 150 case TABLE_ROW_GROUP: 151 case TABLE_HEADER_GROUP: 152 case TABLE_FOOTER_GROUP: 153 return new (arena) RenderTableSection(node); 154 case TABLE_ROW: 155 return new (arena) RenderTableRow(node); 156 case TABLE_COLUMN_GROUP: 157 case TABLE_COLUMN: 158 return new (arena) RenderTableCol(node); 159 case TABLE_CELL: 160 return new (arena) RenderTableCell(node); 161 case TABLE_CAPTION: 162 return new (arena) RenderBlock(node); 163 case BOX: 164 case INLINE_BOX: 165 return new (arena) RenderDeprecatedFlexibleBox(node); 166 case FLEXBOX: 167 case INLINE_FLEXBOX: 168 return new (arena) RenderFlexibleBox(node); 133 #if ENABLE(CSS_GRID_LAYOUT) 134 // For now, we don't show grid elements. 135 case GRID: 136 #endif 137 case NONE: 138 return 0; 139 case INLINE: 140 return new (arena) RenderInline(node); 141 case BLOCK: 142 case INLINE_BLOCK: 143 case RUN_IN: 144 case COMPACT: 145 // Only non-replaced block elements can become a region. 146 if (!style->regionThread().isEmpty() && doc->renderView()) 147 return new (arena) RenderRegion(node, doc->renderView()->renderFlowThreadWithName(style->regionThread())); 148 return new (arena) RenderBlock(node); 149 case LIST_ITEM: 150 return new (arena) RenderListItem(node); 151 case TABLE: 152 case INLINE_TABLE: 153 return new (arena) RenderTable(node); 154 case TABLE_ROW_GROUP: 155 case TABLE_HEADER_GROUP: 156 case TABLE_FOOTER_GROUP: 157 return new (arena) RenderTableSection(node); 158 case TABLE_ROW: 159 return new (arena) RenderTableRow(node); 160 case TABLE_COLUMN_GROUP: 161 case TABLE_COLUMN: 162 return new (arena) RenderTableCol(node); 163 case TABLE_CELL: 164 return new (arena) RenderTableCell(node); 165 case TABLE_CAPTION: 166 return new (arena) RenderBlock(node); 167 case BOX: 168 case INLINE_BOX: 169 return new (arena) RenderDeprecatedFlexibleBox(node); 170 case FLEXBOX: 171 case INLINE_FLEXBOX: 172 return new (arena) RenderFlexibleBox(node); 169 173 } 170 174 -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r100198 r100338 414 414 TABLE_CAPTION, BOX, INLINE_BOX, 415 415 FLEXBOX, INLINE_FLEXBOX, 416 #if ENABLE(CSS_GRID_LAYOUT) 417 GRID, 418 #endif 416 419 NONE 417 420 };
Note: See TracChangeset
for help on using the changeset viewer.