Commit 16454021 authored by dimich@chromium.org's avatar dimich@chromium.org
Browse files

2011-01-19 Sheriff Bot <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r76187.
        http://trac.webkit.org/changeset/76187
        https://bugs.webkit.org/show_bug.cgi?id=52778

        Broke caret-showing tests on SnowLeopard and Chromium
        (Requested by dimich on #webkit).

        * editing/selection/caret-painting-in-overflowing-autowrap-content.html: Removed.
        * editing/selection/resources/iframe-positioning-caret-at-end.html: Removed.
        * platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.checksum: Removed.
        * platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.png: Removed.
        * platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt: Removed.
2011-01-19  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r76187.
        http://trac.webkit.org/changeset/76187
        https://bugs.webkit.org/show_bug.cgi?id=52778

        Broke caret-showing tests on SnowLeopard and Chromium
        (Requested by dimich on #webkit).

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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76202 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ab365cee
2011-01-19 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r76187.
http://trac.webkit.org/changeset/76187
https://bugs.webkit.org/show_bug.cgi?id=52778
Broke caret-showing tests on SnowLeopard and Chromium
(Requested by dimich on #webkit).
* editing/selection/caret-painting-in-overflowing-autowrap-content.html: Removed.
* editing/selection/resources/iframe-positioning-caret-at-end.html: Removed.
* platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.checksum: Removed.
* platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.png: Removed.
* platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt: Removed.
2011-01-19 Yuzo Fujishima <yuzo@google.com>
 
Reviewed by Kent Tamura.
......
<html>
<body>
<iframe src="resources/iframe-positioning-caret-at-end.html" style="border:1px solid black; width:300px; height:100px" id="iframe" onLoad="this.focus()"></iframe>
<p>The caret should be able to be positioned at the end of the editable content in the IFrame.</p>
</body></html>
\ No newline at end of file
<html><head></head>
<script>
function runTest() {
document.designMode = 'on';
var selection = window.getSelection();
selection.setPosition(document.body, 1);
window.scrollTo(1000, 0);
};
</script>
<body onLoad="runTest();">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXXX</body>
</html>
\ No newline at end of file
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576
RenderBlock (anonymous) at (0,0) size 784x102
RenderPartObject {IFRAME} at (0,0) size 302x102 [border: (1px solid #000000)]
layer at (0,0) size 569x85
RenderView at (0,0) size 300x85
layer at (0,0) size 300x85
RenderBlock {HTML} at (0,0) size 300x85
RenderBody {BODY} at (8,8) size 284x69
RenderText {#text} at (0,0) size 561x18
text run at (0,0) width 561: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXXX"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,118) size 784x18
RenderText {#text} at (0,0) size 558x18
text run at (0,0) width 558: "The caret should be able to be positioned at the end of the editable content in the IFrame."
2011-01-19 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r76187.
http://trac.webkit.org/changeset/76187
https://bugs.webkit.org/show_bug.cgi?id=52778
Broke caret-showing tests on SnowLeopard and Chromium
(Requested by dimich on #webkit).
* rendering/RenderText.cpp:
(WebCore::RenderText::localCaretRect):
2011-01-19 Yuzo Fujishima <yuzo@google.com>
 
Reviewed by Kent Tamura.
......@@ -510,11 +510,11 @@ IntRect RenderText::localCaretRect(InlineBox* inlineBox, int caretOffset, int* e
int leftEdge;
int rightEdge;
if (style()->autoWrap()) {
leftEdge = cb->logicalLeftLayoutOverflow();
rightEdge = cb->logicalRightLayoutOverflow();
leftEdge = cb->logicalLeft();
rightEdge = cb->logicalRight();
} else {
leftEdge = min(cb->logicalLeftLayoutOverflow(), rootLeft);
rightEdge = max(cb->logicalRightLayoutOverflow(), rootRight);
leftEdge = min(cb->logicalLeft(), rootLeft);
rightEdge = max(cb->logicalRight(), rootRight);
}
bool rightAligned = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment