Changeset 155318 in webkit for trunk/Source/WebCore/rendering/RenderReplaced.cpp

Timestamp:

Sep 8, 2013, 7:11:06 PM (12 years ago)

Author:

[email protected]

Message:

InlineBox::root() should return a reference.
<​https://webkit.org/b/121014>

Reviewed by Antti Koivisto.

There is always a root inline box, so make root() return a reference.
Also make some effort to cache the result in a local at call sites.

File:

• trunk/Source/WebCore/rendering/RenderReplaced.cpp (modified) (4 diffs)

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -190 +190 @@
     LayoutUnit bottom = adjustedPaintOffset.y() + visualOverflowRect().maxY();
     if (isSelected() && m_inlineBoxWrapper) {
-        LayoutUnit selTop = paintOffset.y() + m_inlineBoxWrapper->root()->selectionTop();
-        LayoutUnit selBottom = paintOffset.y() + selTop + m_inlineBoxWrapper->root()->selectionHeight();
+        const RootInlineBox& rootBox = m_inlineBoxWrapper->root();
+        LayoutUnit selTop = paintOffset.y() + rootBox.selectionTop();
+        LayoutUnit selBottom = paintOffset.y() + selTop + rootBox.selectionHeight();
         top = min(selTop, top);
         bottom = max(selBottom, bottom);
@@ -491 +492 @@
     // FIXME: This code is buggy if the replaced element is relative positioned.
     InlineBox* box = inlineBoxWrapper();
-    RootInlineBox* rootBox = box ? box->root() : 0;
+    const RootInlineBox* rootBox = box ? &box->root() : 0;
     
     LayoutUnit top = rootBox ? rootBox->selectionTop() : logicalTop();
@@ -539 +540 @@
         return LayoutRect(LayoutPoint(), size());
     
-    RootInlineBox* root = m_inlineBoxWrapper->root();
-    LayoutUnit newLogicalTop = root->block().style()->isFlippedBlocksWritingMode() ? m_inlineBoxWrapper->logicalBottom() - root->selectionBottom() : root->selectionTop() - m_inlineBoxWrapper->logicalTop();
-    if (root->block().style()->isHorizontalWritingMode())
-        return LayoutRect(0, newLogicalTop, width(), root->selectionHeight());
-    return LayoutRect(newLogicalTop, 0, root->selectionHeight(), height());
+    const RootInlineBox& rootBox = m_inlineBoxWrapper->root();
+    LayoutUnit newLogicalTop = rootBox.block().style()->isFlippedBlocksWritingMode() ? m_inlineBoxWrapper->logicalBottom() - rootBox.selectionBottom() : rootBox.selectionTop() - m_inlineBoxWrapper->logicalTop();
+    if (rootBox.block().style()->isHorizontalWritingMode())
+        return LayoutRect(0, newLogicalTop, width(), rootBox.selectionHeight());
+    return LayoutRect(newLogicalTop, 0, rootBox.selectionHeight(), height());
 }
 
@@ -552 +553 @@
 
     if (m_inlineBoxWrapper && canUpdateSelectionOnRootLineBoxes())
-        if (RootInlineBox* root = m_inlineBoxWrapper->root())
-            root->setHasSelectedChildren(isSelected());
+        m_inlineBoxWrapper->root().setHasSelectedChildren(isSelected());
 }