Changeset 58191 in webkit

Timestamp:

Apr 23, 2010 3:07:46 PM (14 years ago)

Author:

xji@chromium.org

Message:

2010-04-23 Xiaomei Ji <​xji@chromium.org>

Reviewed by Dan Bernstein and Darin Adler

Fix issue "caret does not paint after type in characters in right
aligned div or after delete all characters in RTL div or
0px right padding RTL textarea"
​https://bugs.webkit.org/show_bug.cgi?id=25319

Test: editing/inserting/caret-position.html

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

2010-04-23 Xiaomei Ji <​xji@chromium.org>

Reviewed by Dan Bernstein and Darin Adler

Fix issue "caret does not paint after type in characters in right
aligned div or after delete all characters in RTL div or
0px right padding RTL textarea"
​https://bugs.webkit.org/show_bug.cgi?id=25319

• editing/inserting/caret-position-expected.txt: Added.
• editing/inserting/caret-position.html: Added.
• platform/mac/editing/input/caret-primary-bidi-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/caret-position-expected.txt (added)
• LayoutTests/editing/inserting/caret-position.html (added)
• LayoutTests/platform/mac/editing/input/caret-primary-bidi-expected.txt (modified) (4 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-23  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by Dan Bernstein and Darin Adler
+
+        Fix issue "caret does not paint after type in characters in right
+        aligned div or after delete all characters in RTL div or 
+        0px right padding RTL textarea"
+        https://bugs.webkit.org/show_bug.cgi?id=25319
+
+        * editing/inserting/caret-position-expected.txt: Added.
+        * editing/inserting/caret-position.html: Added.
+        * platform/mac/editing/input/caret-primary-bidi-expected.txt:
+
 2010-04-23  MORITA Hajime  <morrita@google.com>
 

trunk/LayoutTests/platform/mac/editing/input/caret-primary-bidi-expected.txt

@@ -42 +42 @@
 41: 97,478,0,28
 42: 126,478,0,28
-43: 792,450,0,28
+43: 791,450,0,28
 44: 764,450,0,28
 45: 779,450,0,28
@@ -58 +58 @@
 57: 618,450,0,28
 58: 590,450,0,28
-59: 792,422,0,28
+59: 791,422,0,28
 60: 777,422,0,28
 61: 763,422,0,28
@@ -68 +68 @@
 67: 677,422,0,28
 68: 669,422,0,28
-69: 792,394,0,28
+69: 791,394,0,28
 70: 777,394,0,28
 71: 763,394,0,28
@@ -75 +75 @@
 74: 643,394,0,28
 75: 635,394,0,28
-76: 792,364,0,28
+76: 791,364,0,28
 77: 764,364,0,28
 78: 779,364,0,28

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-23  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by Dan Bernstein and Darin Adler
+
+        Fix issue "caret does not paint after type in characters in right
+        aligned div or after delete all characters in RTL div or 
+        0px right padding RTL textarea"
+        https://bugs.webkit.org/show_bug.cgi?id=25319
+
+        Test: editing/inserting/caret-position.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::localCaretRect):
+
 2010-04-23  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/WebCore/rendering/RenderText.cpp

@@ -456 +456 @@
 
     RenderBlock* cb = containingBlock();
+    RenderStyle* cbStyle = cb->style();
+    int leftEdge;
+    int rightEdge;
     if (style()->autoWrap()) {
-        int availableWidth = cb->lineWidth(top, false);
-        if (box->direction() == LTR)
-            left = min(left, rootLeft + availableWidth - caretWidthRightOfOffset);
-        else
-            left = max(left, cb->x());
+        leftEdge = cb->x();
+        rightEdge = cb->frameRect().right();
     } else {
-        // If there is no wrapping, the caret can leave its containing block, but not its root line box.
-        if (cb->style()->direction() == LTR) {
-            int rightEdge = max(cb->width(), rootRight);
-            left = min(left, rightEdge - caretWidthRightOfOffset);
-            left = max(left, rootLeft);
-        } else {
-            int leftEdge = min(cb->x(), rootLeft);
-            left = max(left, leftEdge);
-            left = min(left, rootRight - caretWidth);
-        }
+        leftEdge = min(cb->x(), rootLeft);
+        rightEdge = max(cb->frameRect().right(), rootRight);
+    }
+
+    bool rightAligned = false;
+    switch (cbStyle->textAlign()) {
+    case TAAUTO:
+    case JUSTIFY:
+        rightAligned = cbStyle->direction() == RTL;
+        break;
+    case RIGHT:
+    case WEBKIT_RIGHT:
+        rightAligned = true;
+        break;
+    case LEFT:
+    case WEBKIT_LEFT:
+    case CENTER:
+    case WEBKIT_CENTER:
+        break;
+    }
+
+    if (rightAligned) {
+        left = max(left, leftEdge);
+        left = min(left, rootRight - caretWidth);
+    } else {
+        left = min(left, rightEdge - caretWidthRightOfOffset);
+        left = max(left, rootLeft);
     }