Title: [139783] trunk/Source/WebCore
- Revision
- 139783
- Author
- o...@chromium.org
- Date
- 2013-01-15 13:43:17 -0800 (Tue, 15 Jan 2013)
Log Message
Remove bogus assert added in http://trac.webkit.org/changeset/139772.
* rendering/RenderBox.h:
(WebCore::RenderBox::computePreferredLogicalWidths):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139782 => 139783)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 21:41:47 UTC (rev 139782)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 21:43:17 UTC (rev 139783)
@@ -1,5 +1,11 @@
2013-01-15 Ojan Vafai <o...@chromium.org>
+ Remove bogus assert added in http://trac.webkit.org/changeset/139772.
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::computePreferredLogicalWidths):
+
+2013-01-15 Ojan Vafai <o...@chromium.org>
+
Moving updating of margins from computePreferredLogicalWidths to layout
https://bugs.webkit.org/show_bug.cgi?id=106939
Modified: trunk/Source/WebCore/rendering/RenderBox.h (139782 => 139783)
--- trunk/Source/WebCore/rendering/RenderBox.h 2013-01-15 21:41:47 UTC (rev 139782)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2013-01-15 21:43:17 UTC (rev 139783)
@@ -658,7 +658,7 @@
// This function calculates the minimum and maximum preferred widths for an object.
// These values are used in shrink-to-fit layout systems.
// These include tables, positioned objects, floats and flexible boxes.
- virtual void computePreferredLogicalWidths() { ASSERT_NOT_REACHED(); setPreferredLogicalWidthsDirty(false); }
+ virtual void computePreferredLogicalWidths() { setPreferredLogicalWidthsDirty(false); }
virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE { return frameRect(); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
