Changeset 139749 in webkit

Timestamp:

Jan 15, 2013 9:54:22 AM (11 years ago)

Author:

ojan@chromium.org

Message:

RenderView does not need to override computePreferredLogicalWidth
​https://bugs.webkit.org/show_bug.cgi?id=106852

Reviewed by Levi Weintraub.

Calling minPreferredLogicalWidth calls computePreferredLogicalWidth,
which happens a few lines later in layoutWithFlattening. No need
to call it explicitly.

• rendering/RenderFrameBase.cpp:

(WebCore::RenderFrameBase::layoutWithFlattening):

• rendering/RenderView.cpp:
• rendering/RenderView.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFrameBase.cpp (modified) (1 diff)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-15  Ojan Vafai  <ojan@chromium.org>
+
+        RenderView does not need to override computePreferredLogicalWidth
+        https://bugs.webkit.org/show_bug.cgi?id=106852
+
+        Reviewed by Levi Weintraub.
+
+        Calling minPreferredLogicalWidth calls computePreferredLogicalWidth,
+        which happens a few lines later in layoutWithFlattening. No need
+        to call it explicitly.
+
+        * rendering/RenderFrameBase.cpp:
+        (WebCore::RenderFrameBase::layoutWithFlattening):
+        * rendering/RenderView.cpp:
+        * rendering/RenderView.h:
+
 2013-01-15  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFrameBase.cpp

@@ -68 +68 @@
     // need to update to calculate min/max correctly
     updateWidgetPosition();
-    if (childRoot->preferredLogicalWidthsDirty())
-        childRoot->computePreferredLogicalWidths();
 
     // if scrollbars are off, and the width or height are fixed

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -115 +115 @@
 }
 
-void RenderView::computePreferredLogicalWidths()
-{
-    ASSERT(preferredLogicalWidthsDirty());
-
-    RenderBlock::computePreferredLogicalWidths();
-}
-
 LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType heightType) const
 {

trunk/Source/WebCore/rendering/RenderView.h

@@ -62 +62 @@
     virtual void updateLogicalWidth() OVERRIDE;
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
-    // FIXME: This override is not needed and should be removed
-    // it only exists to make computePreferredLogicalWidths public.
-    virtual void computePreferredLogicalWidths() OVERRIDE;
 
     virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const OVERRIDE;