Changeset 139782 in webkit

Timestamp:

Jan 15, 2013, 1:41:47 PM (12 years ago)

Author:

ojan@chromium.org

Message:

Moving updating of margins from computePreferredLogicalWidths to layout
​https://bugs.webkit.org/show_bug.cgi?id=106939

Reviewed by Levi Weintraub.

The margins don't affect it's preferred width. We should update them
during layout like we do in other classes (e.g. RenderBlock).

• rendering/RenderListMarker.cpp:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderListMarker.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-15  Ojan Vafai  <ojan@chromium.org>
+
+        Moving updating of margins from computePreferredLogicalWidths to layout
+        https://bugs.webkit.org/show_bug.cgi?id=106939
+
+        Reviewed by Levi Weintraub.
+
+        The margins don't affect it's preferred width. We should update them
+        during layout like we do in other classes (e.g. RenderBlock).
+
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::layout):
+        (WebCore::RenderListMarker::computePreferredLogicalWidths):
+
 2013-01-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderListMarker.cpp

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