2011-01-27 Ryosuke Niwa <rniwa@webkit.org>

        Unreviewed, rolling out r76839.
        http://trac.webkit.org/changeset/76839
        https://bugs.webkit.org/show_bug.cgi?id=49744

        broke pixel tests

        * rendering/RenderBox.cpp:
        (WebCore::RenderBox::localCaretRect):
2011-01-27  Ryosuke Niwa  <rniwa@webkit.org>

        Unreviewed, rolling out r76839.
        http://trac.webkit.org/changeset/76839
        https://bugs.webkit.org/show_bug.cgi?id=49744

        broke pixel tests

        * editing/selection/caret-painting-after-paste-undo-rtl.html: Removed.
        * editing/selection/caret-painting-after-paste-undo.html: Removed.
        * platform/mac/editing/deleting/5408255-expected.png:
        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum: Removed.
        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png: Removed.
        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt: Removed.
        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum: Removed.
        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png: Removed.
        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt: Removed.


Canonical link: https://commits.webkit.org/67090@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,21 @@
+2011-01-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed, rolling out r76839.
+        http://trac.webkit.org/changeset/76839
+        https://bugs.webkit.org/show_bug.cgi?id=49744
+
+        broke pixel tests
+
+        * editing/selection/caret-painting-after-paste-undo-rtl.html: Removed.
+        * editing/selection/caret-painting-after-paste-undo.html: Removed.
+        * platform/mac/editing/deleting/5408255-expected.png:
+        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum: Removed.
+        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png: Removed.
+        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt: Removed.
+        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum: Removed.
+        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png: Removed.
+        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt: Removed.
+
 2011-01-27  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin Adler.

Source/WebCore/ChangeLog

@@ -1,3 +1,14 @@
+2011-01-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed, rolling out r76839.
+        http://trac.webkit.org/changeset/76839
+        https://bugs.webkit.org/show_bug.cgi?id=49744
+
+        broke pixel tests
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::localCaretRect):
+
 2011-01-27  Emil A Eklund  <eae@chromium.org>
 
         Reviewed by Darin Adler.

Source/WebCore/rendering/RenderBox.cpp

@@ -2960,16 +2960,12 @@ IntRect RenderBox::localCaretRect(InlineBox* box, int caretOffset, int* extraWid
     // They never refer to children.
     // FIXME: Paint the carets inside empty blocks differently than the carets before/after elements.
 
+    // FIXME: What about border and padding?
     IntRect rect(x(), y(), caretWidth, height());
     bool ltr = box ? box->isLeftToRightDirection() : style()->isLeftToRightDirection();
 
-    if (isTable()) {
-        if ((!caretOffset) ^ ltr)
-            rect.move(IntSize(width() - caretWidth, 0));
-    } else if ((!caretOffset) ^ ltr)
-        rect.move(IntSize(width() - caretWidth - borderRight() - paddingRight(), borderTop() + paddingTop()));
-    else
-        rect.move(IntSize(borderLeft() + paddingLeft(), borderTop() + paddingTop()));
+    if ((!caretOffset) ^ ltr)
+        rect.move(IntSize(width() - caretWidth, 0));
 
     if (box) {
         RootInlineBox* rootBox = box->root();