Title: [139772] trunk/Source/WebCore
- Revision
- 139772
- Author
- o...@chromium.org
- Date
- 2013-01-15 12:39:40 -0800 (Tue, 15 Jan 2013)
Log Message
Cleanup visibility of some computePreferredLogicalWidths calls
https://bugs.webkit.org/show_bug.cgi?id=106933
Reviewed by Levi Weintraub.
No need for these to be public.
* rendering/RenderBox.h:
(WebCore::RenderBox::computePreferredLogicalWidths):
This should never get called in practice. Add an assert to that effect.
* rendering/RenderGrid.h:
(RenderGrid):
* rendering/RenderReplica.h:
(RenderReplica):
* rendering/RenderScrollbarPart.h:
(RenderScrollbarPart):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139771 => 139772)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 20:03:10 UTC (rev 139771)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 20:39:40 UTC (rev 139772)
@@ -1,3 +1,23 @@
+2013-01-15 Ojan Vafai <o...@chromium.org>
+
+ Cleanup visibility of some computePreferredLogicalWidths calls
+ https://bugs.webkit.org/show_bug.cgi?id=106933
+
+ Reviewed by Levi Weintraub.
+
+ No need for these to be public.
+
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::computePreferredLogicalWidths):
+ This should never get called in practice. Add an assert to that effect.
+
+ * rendering/RenderGrid.h:
+ (RenderGrid):
+ * rendering/RenderReplica.h:
+ (RenderReplica):
+ * rendering/RenderScrollbarPart.h:
+ (RenderScrollbarPart):
+
2013-01-13 Dirk Schulze <dschu...@adobe.com>
[CSS Filters] brightness() function doesn't work as specified
Modified: trunk/Source/WebCore/rendering/RenderBox.h (139771 => 139772)
--- trunk/Source/WebCore/rendering/RenderBox.h 2013-01-15 20:03:10 UTC (rev 139771)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2013-01-15 20:39:40 UTC (rev 139772)
@@ -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() { setPreferredLogicalWidthsDirty(false); }
+ virtual void computePreferredLogicalWidths() { ASSERT_NOT_REACHED(); setPreferredLogicalWidthsDirty(false); }
virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE { return frameRect(); }
Modified: trunk/Source/WebCore/rendering/RenderGrid.h (139771 => 139772)
--- trunk/Source/WebCore/rendering/RenderGrid.h 2013-01-15 20:03:10 UTC (rev 139771)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2013-01-15 20:39:40 UTC (rev 139772)
@@ -40,13 +40,13 @@
virtual const char* renderName() const OVERRIDE;
virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE;
- virtual void computePreferredLogicalWidths() OVERRIDE;
virtual bool avoidsFloats() const OVERRIDE { return true; }
virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }
private:
virtual bool isRenderGrid() const OVERRIDE { return true; }
+ virtual void computePreferredLogicalWidths() OVERRIDE;
enum TrackSizingDirection { ForColumns, ForRows };
void computedUsedBreadthOfGridTracks(TrackSizingDirection, Vector<GridTrack>&);
Modified: trunk/Source/WebCore/rendering/RenderReplica.h (139771 => 139772)
--- trunk/Source/WebCore/rendering/RenderReplica.h 2013-01-15 20:03:10 UTC (rev 139771)
+++ trunk/Source/WebCore/rendering/RenderReplica.h 2013-01-15 20:39:40 UTC (rev 139772)
@@ -43,12 +43,12 @@
virtual bool requiresLayer() const { return true; }
virtual void layout();
- virtual void computePreferredLogicalWidths();
virtual void paint(PaintInfo&, const LayoutPoint&);
private:
virtual bool isReplica() const { return true; }
+ virtual void computePreferredLogicalWidths();
};
Modified: trunk/Source/WebCore/rendering/RenderScrollbarPart.h (139771 => 139772)
--- trunk/Source/WebCore/rendering/RenderScrollbarPart.h 2013-01-15 20:03:10 UTC (rev 139771)
+++ trunk/Source/WebCore/rendering/RenderScrollbarPart.h 2013-01-15 20:39:40 UTC (rev 139772)
@@ -43,7 +43,6 @@
virtual bool requiresLayer() const { return false; }
virtual void layout();
- virtual void computePreferredLogicalWidths();
void paintIntoRect(GraphicsContext*, const LayoutPoint&, const LayoutRect&);
@@ -62,6 +61,8 @@
virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
private:
+ virtual void computePreferredLogicalWidths();
+
void layoutHorizontalPart();
void layoutVerticalPart();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
