Changeset 83348 in webkit

Timestamp:

Apr 8, 2011 3:34:56 PM (13 years ago)

Author:

xji@chromium.org

Message:

2011-04-08 Xiaomei Ji <​xji@chromium.org>

Reviewed by David Hyatt.

Local caret rectangle calculation should be relative to its containing block.
​https://bugs.webkit.org/show_bug.cgi?id=49508.

• fast/forms/cursor-at-editable-content-boundary-expected.txt: Added.
• fast/forms/cursor-at-editable-content-boundary.html: Added.

2011-04-08 Xiaomei Ji <​xji@chromium.org>

Reviewed by David Hyatt.

Local caret rectangle calculation should be relative to its containing block.
​https://bugs.webkit.org/show_bug.cgi?id=49508.

InlineBox and caret rectangle are positioned relative to its containing block.
So its left and right edge value should be relative to its containing block as well.

Test: fast/forms/cursor-at-editable-content-boundary.html

• rendering/RenderText.cpp: (WebCore::RenderText::localCaretRect):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/cursor-at-editable-content-boundary-expected.txt (added)
• LayoutTests/fast/forms/cursor-at-editable-content-boundary.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-08  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Local caret rectangle calculation should be relative to its containing block.
+        https://bugs.webkit.org/show_bug.cgi?id=49508.
+
+        * fast/forms/cursor-at-editable-content-boundary-expected.txt: Added.
+        * fast/forms/cursor-at-editable-content-boundary.html: Added.
+
 2011-04-08  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-08  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Local caret rectangle calculation should be relative to its containing block.
+        https://bugs.webkit.org/show_bug.cgi?id=49508.
+
+        InlineBox and caret rectangle are positioned relative to its containing block.
+        So its left and right edge value should be relative to its containing block as well. 
+
+        Test: fast/forms/cursor-at-editable-content-boundary.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::localCaretRect):
+
 2011-04-08  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -535 +535 @@
     float rightEdge;
     if (style()->autoWrap()) {
-        leftEdge = cb->logicalLeft();
-        rightEdge = cb->logicalRight();
+        leftEdge = 0;
+        rightEdge = cb->logicalWidth();
     } else {
-        leftEdge = min(static_cast<float>(cb->logicalLeft()), rootLeft);
-        rightEdge = max(static_cast<float>(cb->logicalRight()), rootRight);
+        leftEdge = min(static_cast<float>(0), rootLeft);
+        rightEdge = max(static_cast<float>(cb->logicalWidth()), rootRight);
     }