Title: [127937] trunk/Source/WebCore
Revision
127937
Author
[email protected]
Date
2012-09-07 16:54:30 -0700 (Fri, 07 Sep 2012)

Log Message

Add OVERRIDE to computeLogical{Width,Height} overrides
https://bugs.webkit.org/show_bug.cgi?id=96153

Reviewed by Ojan Vafai.

I plan on renaming these functions to updateLogical{Width,Height} and
I want to be extra sure that I don't mess up.

No new tests, this is just a refactoring.

* rendering/RenderFlowThread.h: Also mark the functions virtual!
* rendering/RenderListBox.h:
(RenderListBox):
* rendering/RenderMeter.h:
(RenderMeter):
* rendering/RenderTable.h:
(RenderTable):
* rendering/RenderTableCell.h:
(RenderTableCell):
* rendering/RenderTextControl.h:
(RenderTextControl):
* rendering/svg/RenderSVGForeignObject.h:
(RenderSVGForeignObject):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (127936 => 127937)


--- trunk/Source/WebCore/ChangeLog	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/ChangeLog	2012-09-07 23:54:30 UTC (rev 127937)
@@ -1,3 +1,29 @@
+2012-09-07  Tony Chang  <[email protected]>
+
+        Add OVERRIDE to computeLogical{Width,Height} overrides
+        https://bugs.webkit.org/show_bug.cgi?id=96153
+
+        Reviewed by Ojan Vafai.
+
+        I plan on renaming these functions to updateLogical{Width,Height} and
+        I want to be extra sure that I don't mess up.
+
+        No new tests, this is just a refactoring.
+
+        * rendering/RenderFlowThread.h: Also mark the functions virtual!
+        * rendering/RenderListBox.h:
+        (RenderListBox):
+        * rendering/RenderMeter.h:
+        (RenderMeter):
+        * rendering/RenderTable.h:
+        (RenderTable):
+        * rendering/RenderTableCell.h:
+        (RenderTableCell):
+        * rendering/RenderTextControl.h:
+        (RenderTextControl):
+        * rendering/svg/RenderSVGForeignObject.h:
+        (RenderSVGForeignObject):
+
 2012-09-07  Dominic Mazzoni  <[email protected]>
 
         AX: WebCore accessibility roles should be cross-platform

Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (127936 => 127937)


--- trunk/Source/WebCore/rendering/RenderFlowThread.h	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h	2012-09-07 23:54:30 UTC (rev 127937)
@@ -73,8 +73,8 @@
     virtual void removeRegionFromThread(RenderRegion*);
     const RenderRegionList& renderRegionList() const { return m_regionList; }
 
-    void computeLogicalWidth();
-    void computeLogicalHeight();
+    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void computeLogicalHeight() OVERRIDE;
 
     void paintFlowThreadPortionInRegion(PaintInfo&, RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const LayoutPoint&) const;
     bool hitTestFlowThreadPortionInRegion(RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) const;

Modified: trunk/Source/WebCore/rendering/RenderListBox.h (127936 => 127937)


--- trunk/Source/WebCore/rendering/RenderListBox.h	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/rendering/RenderListBox.h	2012-09-07 23:54:30 UTC (rev 127937)
@@ -77,7 +77,7 @@
 
     virtual void computePreferredLogicalWidths();
     virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
-    virtual void computeLogicalHeight();
+    virtual void computeLogicalHeight() OVERRIDE;
 
     virtual void layout();
 

Modified: trunk/Source/WebCore/rendering/RenderMeter.h (127936 => 127937)


--- trunk/Source/WebCore/rendering/RenderMeter.h	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/rendering/RenderMeter.h	2012-09-07 23:54:30 UTC (rev 127937)
@@ -39,8 +39,8 @@
     virtual void updateFromElement();
 
 private:    
-    virtual void computeLogicalWidth();
-    virtual void computeLogicalHeight();
+    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void computeLogicalHeight() OVERRIDE;
 
     virtual const char* renderName() const { return "RenderMeter"; }
     virtual bool isMeter() const { return true; }

Modified: trunk/Source/WebCore/rendering/RenderTable.h (127936 => 127937)


--- trunk/Source/WebCore/rendering/RenderTable.h	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/rendering/RenderTable.h	2012-09-07 23:54:30 UTC (rev 127937)
@@ -261,7 +261,7 @@
     
     virtual void setCellLogicalWidths();
 
-    virtual void computeLogicalWidth();
+    virtual void computeLogicalWidth() OVERRIDE;
 
     LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth);
 

Modified: trunk/Source/WebCore/rendering/RenderTableCell.h (127936 => 127937)


--- trunk/Source/WebCore/rendering/RenderTableCell.h	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/rendering/RenderTableCell.h	2012-09-07 23:54:30 UTC (rev 127937)
@@ -175,7 +175,7 @@
 
     virtual void willBeRemovedFromTree() OVERRIDE;
 
-    virtual void computeLogicalWidth();
+    virtual void computeLogicalWidth() OVERRIDE;
 
     virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
     virtual void paintMask(PaintInfo&, const LayoutPoint&);

Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (127936 => 127937)


--- trunk/Source/WebCore/rendering/RenderTextControl.h	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h	2012-09-07 23:54:30 UTC (rev 127937)
@@ -62,7 +62,7 @@
     virtual RenderStyle* textBaseStyle() const = 0;
 
     virtual void updateFromElement();
-    virtual void computeLogicalHeight();
+    virtual void computeLogicalHeight() OVERRIDE;
     virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren);
 
 private:

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h (127936 => 127937)


--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h	2012-09-07 23:46:45 UTC (rev 127936)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h	2012-09-07 23:54:30 UTC (rev 127937)
@@ -59,8 +59,8 @@
     virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
 
 private:
-    virtual void computeLogicalWidth();
-    virtual void computeLogicalHeight();
+    virtual void computeLogicalWidth() OVERRIDE;
+    virtual void computeLogicalHeight() OVERRIDE;
 
     virtual const AffineTransform& localToParentTransform() const;
     virtual AffineTransform localTransform() const { return m_localTransform; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to