Changeset 79286 in webkit

Timestamp:

Feb 21, 2011 9:51:51 PM (13 years ago)

Author:

thakis@chromium.org

Message:

2011-02-21 Nico Weber <​thakis@chromium.org>

Reviewed by Adam Barth.

canAccommodateEllipsis() confuses clang's -Woverloaded-virtual
​https://bugs.webkit.org/show_bug.cgi?id=54909

Rename the overload in RootInlineBox to lineCanAccomodateEllipsis() to
unconfuse clang. No intended functionality change.

• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::checkLinesForTextOverflow):
• rendering/RenderFlexibleBox.cpp: (WebCore::RenderFlexibleBox::applyLineClamp):
• rendering/RootInlineBox.cpp: (WebCore::RootInlineBox::lineCanAccommodateEllipsis):
• rendering/RootInlineBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (1 diff)
• rendering/RootInlineBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-21  Nico Weber  <thakis@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        canAccommodateEllipsis() confuses clang's -Woverloaded-virtual
+        https://bugs.webkit.org/show_bug.cgi?id=54909
+
+        Rename the overload in RootInlineBox to lineCanAccomodateEllipsis() to
+        unconfuse clang. No intended functionality change.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::checkLinesForTextOverflow):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::applyLineClamp):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::lineCanAccommodateEllipsis):
+        * rendering/RootInlineBox.h:
+
 2011-02-21  Adele Peterson  <adele@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2131 +2131 @@
             int width = curr == firstRootBox() ? firstLineEllipsisWidth : ellipsisWidth;
             int blockEdge = ltr ? blockRightEdge : blockLeftEdge;
-            if (curr->canAccommodateEllipsis(ltr, blockEdge, lineBoxEdge, width))
+            if (curr->lineCanAccommodateEllipsis(ltr, blockEdge, lineBoxEdge, width))
                 curr->placeEllipsis(ellipsisStr, ltr, blockLeftEdge, blockRightEdge, width);
         }

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -1005 +1005 @@
 
         int blockEdge = leftToRight ? blockRightEdge : blockLeftEdge;
-        if (!lastVisibleLine->canAccommodateEllipsis(leftToRight, blockEdge, lastVisibleLine->x() + lastVisibleLine->logicalWidth(), totalWidth))
+        if (!lastVisibleLine->lineCanAccommodateEllipsis(leftToRight, blockEdge, lastVisibleLine->x() + lastVisibleLine->logicalWidth(), totalWidth))
             continue;
 

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -86 +86 @@
 }
 
-bool RootInlineBox::canAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, int ellipsisWidth)
+bool RootInlineBox::lineCanAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, int ellipsisWidth)
 {
     // First sanity-check the unoverflowed width of the whole line to see if there is sufficient room.

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -78 +78 @@
     void childRemoved(InlineBox* box);
 
-    bool canAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, int ellipsisWidth);
+    bool lineCanAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, int ellipsisWidth);
     void placeEllipsis(const AtomicString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox = 0);
     virtual float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, bool& foundBox);