Title: [174554] trunk/Source/WebCore
- Revision
- 174554
- Author
- [email protected]
- Date
- 2014-10-09 20:34:01 -0700 (Thu, 09 Oct 2014)
Log Message
Revert part of r174543 that broke grid layout tests.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::specifiedValueForGridTrackBreadth):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174553 => 174554)
--- trunk/Source/WebCore/ChangeLog 2014-10-10 03:25:23 UTC (rev 174553)
+++ trunk/Source/WebCore/ChangeLog 2014-10-10 03:34:01 UTC (rev 174554)
@@ -1,3 +1,10 @@
+2014-10-09 Simon Fraser <[email protected]>
+
+ Revert part of r174543 that broke grid layout tests.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::specifiedValueForGridTrackBreadth):
+
2014-10-09 Dean Jackson <[email protected]>
Computed style for clip is wrong with respect to auto
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (174553 => 174554)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-10-10 03:25:23 UTC (rev 174553)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-10-10 03:34:01 UTC (rev 174554)
@@ -980,7 +980,9 @@
return cssValuePool().createValue(trackBreadth.flex(), CSSPrimitiveValue::CSS_FR);
const Length& trackBreadthLength = trackBreadth.length();
- return autoOrZoomAdjustedValue(trackBreadthLength, style);
+ if (trackBreadthLength.isAuto())
+ return cssValuePool().createIdentifierValue(CSSValueAuto);
+ return zoomAdjustedPixelValueForLength(trackBreadthLength, style);
}
static PassRef<CSSValue> specifiedValueForGridTrackSize(const GridTrackSize& trackSize, const RenderStyle* style)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
