Changeset 76625 in webkit


Ignore:
Timestamp:
Jan 25, 2011 12:17:08 PM (13 years ago)
Author:
leviw@chromium.org
Message:

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

Reviewed by Darin Adler.

Adding border and padding to the calculation of the local caret rect for RenderBoxes.

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):

2011-01-21 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.checksum:
  • 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.
Location:
trunk
Files:
8 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r76624 r76625  
     12011-01-21  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.checksum:
     14        * platform/mac/editing/deleting/5408255-expected.png:
     15        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum: Added.
     16        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png: Added.
     17        * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt: Added.
     18        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum: Added.
     19        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png: Added.
     20        * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt: Added.
     21
    1222011-01-25  Tony Chang  <tony@chromium.org>
    223

  • trunk/LayoutTests/platform/mac/editing/deleting/5408255-expected.checksum

    r38122 r76625  
    1 ca490445057281bd26f5cab7862bb9cb
     13d62e6dd2bd0bae57beed5f1d3101ca0

  • trunk/Source/WebCore/ChangeLog

    r76622 r76625  
     12011-01-21  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
     7        Undo moves caret to invalid position
     8        https://bugs.webkit.org/show_bug.cgi?id=49744
     9
     10        Tests: editing/selection/caret-painting-after-paste-undo-rtl.html
     11               editing/selection/caret-painting-after-paste-undo.html
     12
     13        * rendering/RenderBox.cpp:
     14        (WebCore::RenderBox::localCaretRect):
     15
    1162011-01-25  Sam Weinig  <sam@webkit.org>
    217

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

    r76442 r76625  
    29552955    // FIXME: Paint the carets inside empty blocks differently than the carets before/after elements.
    29562956
    2957     // FIXME: What about border and padding?
    29582957    IntRect rect(x(), y(), caretWidth, height());
    29592958    bool ltr = box ? box->isLeftToRightDirection() : style()->isLeftToRightDirection();
    … …  
    29612960    if ((!caretOffset) ^ ltr)
    29622961        rect.move(IntSize(width() - caretWidth, 0));
     2962
     2963    if (isTable()) {
     2964        if ((!caretOffset) ^ ltr)
     2965            rect.move(IntSize(width() - caretWidth, 0));
     2966    } else if ((!caretOffset) ^ ltr)
     2967        rect.move(IntSize(width() - caretWidth - borderRight() - paddingRight(), borderTop() + paddingTop()));
     2968    else
     2969        rect.move(IntSize(borderLeft() + paddingLeft(), borderTop() + paddingTop()));
    29632970
    29642971    if (box) {
Note: See TracChangeset for help on using the changeset viewer.