Changeset 139789 in webkit

Timestamp:

Jan 15, 2013 2:15:35 PM (11 years ago)

Author:

ojan@chromium.org

Message:

Unreviewed, rolling out r139782.
​http://trac.webkit.org/changeset/139782
​https://bugs.webkit.org/show_bug.cgi?id=106939

Source/WebCore:

Broke preferred widths on list markers.

• rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::layout):
(WebCore::RenderListMarker::computePreferredLogicalWidths):

LayoutTests:

• fast/lists/marker-preferred-margins-expected.txt: Added.
• fast/lists/marker-preferred-margins.html: Added.

Adding a new test to cover the case that broke.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/lists/marker-preferred-margins-expected.txt (added)
• LayoutTests/fast/lists/marker-preferred-margins.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderListMarker.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-15  Ojan Vafai  <ojan@chromium.org>
+
+        Unreviewed, rolling out r139782.
+        http://trac.webkit.org/changeset/139782
+        https://bugs.webkit.org/show_bug.cgi?id=106939
+
+        * fast/lists/marker-preferred-margins-expected.txt: Added.
+        * fast/lists/marker-preferred-margins.html: Added.
+        Adding a new test to cover the case that broke.
+
 2013-01-15  Elliott Sprehn  <esprehn@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-15  Ojan Vafai  <ojan@chromium.org>
+
+        Unreviewed, rolling out r139782.
+        http://trac.webkit.org/changeset/139782
+        https://bugs.webkit.org/show_bug.cgi?id=106939
+
+        Broke preferred widths on list markers.
+
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::layout):
+        (WebCore::RenderListMarker::computePreferredLogicalWidths):
+
 2013-01-15  Elliott Sprehn  <esprehn@chromium.org>
 

trunk/Source/WebCore/rendering/RenderListMarker.cpp

@@ -1317 +1317 @@
     StackStats::LayoutCheckPoint layoutCheckPoint;
     ASSERT(needsLayout());
-
-    updateMargins();
  
     if (isImage()) {
@@ -1370 +1368 @@
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = style()->isHorizontalWritingMode() ? imageSize.width() : imageSize.height();
         setPreferredLogicalWidthsDirty(false);
+        updateMargins();
         return;
     }
@@ -1480 +1479 @@
 
     setPreferredLogicalWidthsDirty(false);
+
+    updateMargins();
 }