Changeset 76187 in webkit


Ignore:
Timestamp:
Jan 19, 2011 6:03:28 PM (13 years ago)
Author:
leviw@chromium.org
Message:

2011-01-19 Levi Weintraub <leviw@google.com>

Reviewed by Darin Adler.

Re-committing this with the proper expected results.

Changing RenderText::localCaretRect to clip to its containing block's logicalLeft and
logicalRightLayoutOverflow instead of simply using logicalLeft and logicalRight, as this
resulted in the caret being placed incorrectly in overflowing editable IFrame content.

Long lines in non-white-space-pre editable documents show cursor in wrong place
https://bugs.webkit.org/show_bug.cgi?id=48132

  • editing/selection/caret-painting-in-overflowing-autowrap-content.html: Added.
  • editing/selection/resources/iframe-positioning-caret-at-end.html: Added.
  • platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.checksum: Added.
  • platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.png: Added.
  • platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt: Added.

2011-01-19 Levi Weintraub <leviw@google.com>

Reviewed by Darin Adler.

Re-committing this with the proper expected results.

Changing RenderText::localCaretRect to clip to its containing block's logicalLeft and
logicalRightLayoutOverflow instead of simply using logicalLeft and logicalRight, as this
resulted in the caret being placed incorrectly in overflowing editable IFrame content.

Long lines in non-white-space-pre editable documents show cursor in wrong place
https://bugs.webkit.org/show_bug.cgi?id=48132

Test: editing/selection/caret-painting-in-overflowing-autowrap-content.html

  • rendering/RenderText.cpp: (WebCore::RenderText::localCaretRect):
Location:
trunk
Files:
4 added
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r76185 r76187  
     12011-01-19  Levi Weintraub  <leviw@google.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Re-committing this with the proper expected results.
     6
     7        Changing RenderText::localCaretRect to clip to its containing block's logicalLeft and
     8        logicalRightLayoutOverflow instead of simply using logicalLeft and logicalRight, as this
     9        resulted in the caret being placed incorrectly in overflowing editable IFrame content.
     10
     11        Long lines in non-white-space-pre editable documents show cursor in wrong place
     12        https://bugs.webkit.org/show_bug.cgi?id=48132
     13
     14        * editing/selection/caret-painting-in-overflowing-autowrap-content.html: Added.
     15        * editing/selection/resources/iframe-positioning-caret-at-end.html: Added.
     16        * platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.checksum: Added.
     17        * platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.png: Added.
     18        * platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt: Added.
     19
    1202011-01-18  Darin Adler  <darin@apple.com>
    221
  • trunk/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt

    r76144 r76187  
    88          layer at (0,0) size 569x85
    99            RenderView at (0,0) size 300x85
    10           layer at (0,0) size 569x85
     10          layer at (0,0) size 300x85
    1111            RenderBlock {HTML} at (0,0) size 300x85
    1212              RenderBody {BODY} at (8,8) size 284x69
  • trunk/Source/WebCore/ChangeLog

    r76183 r76187  
     12011-01-19  Levi Weintraub  <leviw@google.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Re-committing this with the proper expected results.
     6
     7        Changing RenderText::localCaretRect to clip to its containing block's logicalLeft and
     8        logicalRightLayoutOverflow instead of simply using logicalLeft and logicalRight, as this
     9        resulted in the caret being placed incorrectly in overflowing editable IFrame content.
     10
     11        Long lines in non-white-space-pre editable documents show cursor in wrong place
     12        https://bugs.webkit.org/show_bug.cgi?id=48132
     13
     14        Test: editing/selection/caret-painting-in-overflowing-autowrap-content.html
     15
     16        * rendering/RenderText.cpp:
     17        (WebCore::RenderText::localCaretRect):
     18
    1192011-01-18 MORITA Hajime <morrita@google.com>
    220
  • trunk/Source/WebCore/rendering/RenderText.cpp

    r76170 r76187  
    511511    int rightEdge;
    512512    if (style()->autoWrap()) {
    513         leftEdge = cb->logicalLeft();
    514         rightEdge = cb->logicalRight();
     513        leftEdge = cb->logicalLeftLayoutOverflow();
     514        rightEdge = cb->logicalRightLayoutOverflow();
    515515    } else {
    516         leftEdge = min(cb->logicalLeft(), rootLeft);
    517         rightEdge = max(cb->logicalRight(), rootRight);
     516        leftEdge = min(cb->logicalLeftLayoutOverflow(), rootLeft);
     517        rightEdge = max(cb->logicalRightLayoutOverflow(), rootRight);
    518518    }
    519519
Note: See TracChangeset for help on using the changeset viewer.