Cleanup visibility of some computePreferredLogicalWidths calls
authorojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Jan 2013 20:39:40 +0000 (20:39 +0000)
committerojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Jan 2013 20:39:40 +0000 (20:39 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139772 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBox.h
Source/WebCore/rendering/RenderGrid.h
Source/WebCore/rendering/RenderReplica.h
Source/WebCore/rendering/RenderScrollbarPart.h

index 887c024..ca875a0 100644 (file)
@@ -1,3 +1,23 @@
+2013-01-15  Ojan Vafai  <ojan@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  <dschulze@adobe.com>
 
         [CSS Filters] brightness() function doesn't work as specified
index ee73766..8e4c605 100644 (file)
@@ -658,7 +658,7 @@ private:
     // 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(); }
 
index 8eedfc2..3d026ca 100644 (file)
@@ -40,13 +40,13 @@ public:
     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>&);
index de69443..4b68bc6 100644 (file)
@@ -43,12 +43,12 @@ public:
     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();
 
 };
 
index 2d8a36c..ba5f6a3 100644 (file)
@@ -43,7 +43,6 @@ public:
     virtual bool requiresLayer() const { return false; }
 
     virtual void layout();
-    virtual void computePreferredLogicalWidths();
     
     void paintIntoRect(GraphicsContext*, const LayoutPoint&, const LayoutRect&);
 
@@ -62,6 +61,8 @@ protected:
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
 
 private:
+    virtual void computePreferredLogicalWidths();
+
     void layoutHorizontalPart();
     void layoutVerticalPart();