Changeset 139135 in webkit

Timestamp:

Jan 8, 2013 4:59:43 PM (11 years ago)

Author:

esprehn@chromium.org

Message:

Merge getLineAtIndex into RenderBlock::lineAtIndex
​https://bugs.webkit.org/show_bug.cgi?id=106379

Reviewed by Eric Seidel.

getLineAtIndex can be merged into lineAtIndex, which was it's only caller.

No new tests, just refactoring.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::lineAtIndex):
(WebCore::RenderBlock::lineCount):

• rendering/RenderBlock.h:

(RenderBlock):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/RenderBlock.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-08  Elliott Sprehn  <esprehn@chromium.org>
+
+        Merge getLineAtIndex into RenderBlock::lineAtIndex
+        https://bugs.webkit.org/show_bug.cgi?id=106379
+
+        Reviewed by Eric Seidel.
+
+        getLineAtIndex can be merged into lineAtIndex, which was it's only caller.
+
+        No new tests, just refactoring.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::lineAtIndex):
+        (WebCore::RenderBlock::lineCount):
+        * rendering/RenderBlock.h:
+        (RenderBlock):
+
 2013-01-08  Rafael Weinstein  <rafaelw@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6559 +6559 @@
 }
 
-static RootInlineBox* getLineAtIndex(RenderBlock* block, int i, int& count)
-{
-    if (block->style()->visibility() == VISIBLE) {
-        if (block->childrenInline()) {
-            for (RootInlineBox* box = block->firstRootBox(); box; box = box->nextRootBox()) {
-                if (count++ == i)
-                    return box;
-            }
-        }
-        else {
-            for (RenderObject* obj = block->firstChild(); obj; obj = obj->nextSibling()) {
-                if (shouldCheckLines(obj)) {
-                    RootInlineBox *box = getLineAtIndex(toRenderBlock(obj), i, count);
-                    if (box)
-                        return box;
-                }
-            }
-        }
-    }
-    return 0;
-}
-
 static int getHeightForLineCount(RenderBlock* block, int l, bool includeBottom, int& count)
 {
@@ -6608 +6586 @@
 }
 
-RootInlineBox* RenderBlock::lineAtIndex(int i)
-{
-    int count = 0;
-    return getLineAtIndex(this, i, count);
-}
-
-int RenderBlock::lineCount()
+RootInlineBox* RenderBlock::lineAtIndex(int i) const
+{
+    ASSERT(i >= 0);
+
+    if (style()->visibility() != VISIBLE)
+        return 0;
+
+    if (childrenInline()) {
+        for (RootInlineBox* box = firstRootBox(); box; box = box->nextRootBox())
+            if (!i--)
+                return box;
+    } else {
+        for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+            if (!shouldCheckLines(child))
+                continue;
+            if (RootInlineBox* box = toRenderBlock(child)->lineAtIndex(i))
+                return box;
+        }
+    }
+
+    return 0;
+}
+
+int RenderBlock::lineCount() const
 {
     int count = 0;

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -239 +239 @@
 
     LayoutRect logicalRectToPhysicalRect(const LayoutPoint& physicalPosition, const LayoutRect& logicalRect);
-        
+
     // Helper methods for computing line counts and heights for line counts.
-    RootInlineBox* lineAtIndex(int);
-    int lineCount();
+    RootInlineBox* lineAtIndex(int) const;
+    int lineCount() const;
     int heightForLineCount(int);
     void clearTruncation();