Changeset 76839 in webkit


Ignore:
Timestamp:
Jan 27, 2011 2:38:10 PM (13 years ago)
Author:
leviw@chromium.org
Message:

2011-01-25 Levi Weintraub <​leviw@chromium.org>

Reviewed by Darin Adler.

Updating the expected result for 5408255 and adding tests for caret positioning at the
beginning and end of RenderBoxes.

Undo moves caret to invalid position
​https://bugs.webkit.org/show_bug.cgi?id=49744

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

2011-01-25 Levi Weintraub <​leviw@chromium.org>

Reviewed by Darin Adler.

Adding border and padding to the calculation of the local caret rect for RenderBoxes.
Corrected for mistake in r76625

Undo moves caret to invalid position
​https://bugs.webkit.org/show_bug.cgi?id=49744

Tests: editing/selection/caret-painting-after-paste-undo-rtl.html

editing/selection/caret-painting-after-paste-undo.html

  • rendering/RenderBox.cpp: (WebCore::RenderBox::localCaretRect):
Location:
trunk
Files:
8 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r76838 r76839  
     12011-01-25  Levi Weintraub  <leviw@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Updating the expected result for 5408255 and adding tests for caret positioning at the
     6        beginning and end of RenderBoxes.
     7
     8        Undo moves caret to invalid position
     9        https://bugs.webkit.org/show_bug.cgi?id=49744
     10
     11        * editing/selection/caret-painting-after-paste-undo-rtl.html: Added.
     12        * editing/selection/caret-painting-after-paste-undo.html: Added.
     13        * platform/mac/editing/deleting/5408255-expected.png:
     14        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum: Added.
     15        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png: Added.
     16        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt: Added.
     17        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum: Added.
     18        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png: Added.
     19        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt: Added.
     20
    1212011-01-27  Ryosuke Niwa  <rniwa@webkit.org>
    222

  • trunk/Source/WebCore/ChangeLog

    r76836 r76839  
     12011-01-25  Levi Weintraub  <leviw@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Adding border and padding to the calculation of the local caret rect for RenderBoxes.
     6        Corrected for mistake in r76625
     7
     8        Undo moves caret to invalid position
     9        https://bugs.webkit.org/show_bug.cgi?id=49744
     10
     11        Tests: editing/selection/caret-painting-after-paste-undo-rtl.html
     12               editing/selection/caret-painting-after-paste-undo.html
     13
     14        * rendering/RenderBox.cpp:
     15        (WebCore::RenderBox::localCaretRect):
     16
    1172011-01-27  Sheriff Bot  <webkit.review.bot@gmail.com>
    218

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r76726 r76839  
    29612961    // FIXME: Paint the carets inside empty blocks differently than the carets before/after elements.
    29622962
    2963     // FIXME: What about border and padding?
    29642963    IntRect rect(x(), y(), caretWidth, height());
    29652964    bool ltr = box ? box->isLeftToRightDirection() : style()->isLeftToRightDirection();
    29662965
    2967     if ((!caretOffset) ^ ltr)
    2968         rect.move(IntSize(width() - caretWidth, 0));
     2966    if (isTable()) {
     2967        if ((!caretOffset) ^ ltr)
     2968            rect.move(IntSize(width() - caretWidth, 0));
     2969    } else if ((!caretOffset) ^ ltr)
     2970        rect.move(IntSize(width() - caretWidth - borderRight() - paddingRight(), borderTop() + paddingTop()));
     2971    else
     2972        rect.move(IntSize(borderLeft() + paddingLeft(), borderTop() + paddingTop()));
    29692973
    29702974    if (box) {
Note: See TracChangeset for help on using the changeset viewer.