Title: [139773] trunk/Source/WebCore
Revision
139773
Author
o...@chromium.org
Date
2013-01-15 12:44:25 -0800 (Tue, 15 Jan 2013)

Log Message

RenderText::computePreferredLogicalWidths does not need to be public
https://bugs.webkit.org/show_bug.cgi?id=106934

Reviewed by Levi Weintraub.

* rendering/RenderCounter.h:
Add OVERRIDE keyword.
* rendering/RenderText.h:
Make protected.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (139772 => 139773)


--- trunk/Source/WebCore/ChangeLog	2013-01-15 20:39:40 UTC (rev 139772)
+++ trunk/Source/WebCore/ChangeLog	2013-01-15 20:44:25 UTC (rev 139773)
@@ -1,5 +1,17 @@
 2013-01-15  Ojan Vafai  <o...@chromium.org>
 
+        RenderText::computePreferredLogicalWidths does not need to be public
+        https://bugs.webkit.org/show_bug.cgi?id=106934
+
+        Reviewed by Levi Weintraub.
+
+        * rendering/RenderCounter.h:
+        Add OVERRIDE keyword.
+        * rendering/RenderText.h:
+        Make protected.
+
+2013-01-15  Ojan Vafai  <o...@chromium.org>
+
         Cleanup visibility of some computePreferredLogicalWidths calls
         https://bugs.webkit.org/show_bug.cgi?id=106933
 

Modified: trunk/Source/WebCore/rendering/RenderCounter.h (139772 => 139773)


--- trunk/Source/WebCore/rendering/RenderCounter.h	2013-01-15 20:39:40 UTC (rev 139772)
+++ trunk/Source/WebCore/rendering/RenderCounter.h	2013-01-15 20:44:25 UTC (rev 139773)
@@ -49,7 +49,7 @@
     virtual PassRefPtr<StringImpl> originalText() const;
     
     virtual void updateText() OVERRIDE;
-    virtual void computePreferredLogicalWidths(float leadWidth);
+    virtual void computePreferredLogicalWidths(float leadWidth) OVERRIDE;
 
     // Removes the reference to the CounterNode associated with this renderer.
     // This is used to cause a counter display update when the CounterNode tree changes.

Modified: trunk/Source/WebCore/rendering/RenderText.h (139772 => 139773)


--- trunk/Source/WebCore/rendering/RenderText.h	2013-01-15 20:39:40 UTC (rev 139772)
+++ trunk/Source/WebCore/rendering/RenderText.h	2013-01-15 20:44:25 UTC (rev 139773)
@@ -137,7 +137,6 @@
 
     void checkConsistency() const;
 
-    virtual void computePreferredLogicalWidths(float leadWidth);
     bool isAllCollapsibleWhitespace();
 
     bool canUseSimpleFontCodePath() const { return m_canUseSimpleFontCodePath; }
@@ -148,6 +147,7 @@
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
 protected:
+    virtual void computePreferredLogicalWidths(float leadWidth);
     virtual void willBeDestroyed();
 
     virtual void styleWillChange(StyleDifference, const RenderStyle*) { }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to