Changeset 155949 in webkit

Timestamp:

Sep 17, 2013, 5:33:29 AM (11 years ago)

Author:

Antti Koivisto

Message:

Move text caret rect computation to root inline box
​https://bugs.webkit.org/show_bug.cgi?id=121479

Reviewed by Andreas Kling.

For future code sharing.

• rendering/RenderText.cpp:

(WebCore::RenderText::localCaretRect):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::computeCaretRect):

• rendering/RootInlineBox.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-17  Antti Koivisto  <antti@apple.com>
+
+        Move text caret rect computation to root inline box
+        https://bugs.webkit.org/show_bug.cgi?id=121479
+
+        Reviewed by Andreas Kling.
+
+        For future code sharing.
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::localCaretRect):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::computeCaretRect):
+        * rendering/RootInlineBox.h:
+
 2013-09-17  Alberto Garcia  <berto@igalia.com>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -660 +660 @@
         return LayoutRect();
 
-    ASSERT(inlineBox->isInlineTextBox());
-    if (!inlineBox->isInlineTextBox())
-        return LayoutRect();
-
     InlineTextBox* box = toInlineTextBox(inlineBox);
-
-    const RootInlineBox& rootBox = box->root();
-    int height = rootBox.selectionHeight();
-    int top = rootBox.selectionTop();
-
-    // Go ahead and round left to snap it to the nearest pixel.
     float left = box->positionForOffset(caretOffset);
-
-    // Distribute the caret's width to either side of the offset.
-    int caretWidthLeftOfOffset = caretWidth / 2;
-    left -= caretWidthLeftOfOffset;
-    int caretWidthRightOfOffset = caretWidth - caretWidthLeftOfOffset;
-
-    left = roundf(left);
-
-    float rootLeft = rootBox.logicalLeft();
-    float rootRight = rootBox.logicalRight();
-
-    // FIXME: should we use the width of the root inline box or the
-    // width of the containing block for this?
-    if (extraWidthToEndOfLine)
-        *extraWidthToEndOfLine = (rootBox.logicalWidth() + rootLeft) - (left + 1);
-
-    RenderBlock* cb = containingBlock();
-    RenderStyle* cbStyle = cb->style();
-
-    float leftEdge;
-    float rightEdge;
-    leftEdge = min<float>(0, rootLeft);
-    rightEdge = max<float>(cb->logicalWidth(), rootRight);
-
-    bool rightAligned = false;
-    switch (cbStyle->textAlign()) {
-    case RIGHT:
-    case WEBKIT_RIGHT:
-        rightAligned = true;
-        break;
-    case LEFT:
-    case WEBKIT_LEFT:
-    case CENTER:
-    case WEBKIT_CENTER:
-        break;
-    case JUSTIFY:
-    case TASTART:
-        rightAligned = !cbStyle->isLeftToRightDirection();
-        break;
-    case TAEND:
-        rightAligned = cbStyle->isLeftToRightDirection();
-        break;
-    }
-
-    if (rightAligned) {
-        left = max(left, leftEdge);
-        left = min(left, rootRight - caretWidth);
-    } else {
-        left = min(left, rightEdge - caretWidthRightOfOffset);
-        left = max(left, rootLeft);
-    }
-
-    return style()->isHorizontalWritingMode() ? IntRect(left, top, caretWidth, height) : IntRect(top, left, height, caretWidth);
+    return box->root().computeCaretRect(left, caretWidth, extraWidthToEndOfLine);
 }
 

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -522 +522 @@
 }
 
+IntRect RootInlineBox::computeCaretRect(float logicalLeftPosition, unsigned caretWidth, LayoutUnit* extraWidthToEndOfLine) const
+{
+    int height = selectionHeight();
+    int top = selectionTop();
+
+    // Distribute the caret's width to either side of the offset.
+    float left = logicalLeftPosition;
+    int caretWidthLeftOfOffset = caretWidth / 2;
+    left -= caretWidthLeftOfOffset;
+    int caretWidthRightOfOffset = caretWidth - caretWidthLeftOfOffset;
+    left = roundf(left);
+
+    float rootLeft = logicalLeft();
+    float rootRight = logicalRight();
+
+    if (extraWidthToEndOfLine)
+        *extraWidthToEndOfLine = (logicalWidth() + rootLeft) - (left + caretWidth);
+
+    RenderStyle* blockStyle = block().style();
+
+    bool rightAligned = false;
+    switch (blockStyle->textAlign()) {
+    case RIGHT:
+    case WEBKIT_RIGHT:
+        rightAligned = true;
+        break;
+    case LEFT:
+    case WEBKIT_LEFT:
+    case CENTER:
+    case WEBKIT_CENTER:
+        break;
+    case JUSTIFY:
+    case TASTART:
+        rightAligned = !blockStyle->isLeftToRightDirection();
+        break;
+    case TAEND:
+        rightAligned = blockStyle->isLeftToRightDirection();
+        break;
+    }
+
+    float leftEdge = std::min<float>(0, rootLeft);
+    float rightEdge = std::max<float>(block().logicalWidth(), rootRight);
+
+    if (rightAligned) {
+        left = std::max(left, leftEdge);
+        left = std::min(left, rootRight - caretWidth);
+    } else {
+        left = std::min(left, rightEdge - caretWidthRightOfOffset);
+        left = std::max(left, rootLeft);
+    }
+    return blockStyle->isHorizontalWritingMode() ? IntRect(left, top, caretWidth, height) : IntRect(top, left, height, caretWidth);
+}
+
 RenderObject::SelectionState RootInlineBox::selectionState()
 {

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -135 +135 @@
     GapRects lineSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
         LayoutUnit selTop, LayoutUnit selHeight, const LogicalSelectionOffsetCaches&, const PaintInfo*);
+
+    IntRect computeCaretRect(float logicalLeftPosition, unsigned caretWidth, LayoutUnit* extraWidthToEndOfLine) const;
 
     RenderBlock& block() const;