Title: [139749] trunk/Source/WebCore
- Revision
- 139749
- Author
- o...@chromium.org
- Date
- 2013-01-15 09:54:22 -0800 (Tue, 15 Jan 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139748 => 139749)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 17:50:55 UTC (rev 139748)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 17:54:22 UTC (rev 139749)
@@ -1,3 +1,19 @@
+2013-01-15 Ojan Vafai <o...@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 <vse...@chromium.org>
Unreviewed, remove file that was accidentally added to the wrong patch.
Modified: trunk/Source/WebCore/rendering/RenderFrameBase.cpp (139748 => 139749)
--- trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2013-01-15 17:50:55 UTC (rev 139748)
+++ trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2013-01-15 17:54:22 UTC (rev 139749)
@@ -67,8 +67,6 @@
// 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
// we obey them and do not expand. With frame flattening
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (139748 => 139749)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2013-01-15 17:50:55 UTC (rev 139748)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2013-01-15 17:54:22 UTC (rev 139749)
@@ -114,13 +114,6 @@
setLogicalWidth(viewLogicalWidth());
}
-void RenderView::computePreferredLogicalWidths()
-{
- ASSERT(preferredLogicalWidthsDirty());
-
- RenderBlock::computePreferredLogicalWidths();
-}
-
LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType heightType) const
{
// If we have columns, then the available logical height is reduced to the column height.
Modified: trunk/Source/WebCore/rendering/RenderView.h (139748 => 139749)
--- trunk/Source/WebCore/rendering/RenderView.h 2013-01-15 17:50:55 UTC (rev 139748)
+++ trunk/Source/WebCore/rendering/RenderView.h 2013-01-15 17:54:22 UTC (rev 139749)
@@ -61,9 +61,6 @@
virtual void layout() OVERRIDE;
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
