diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index f1fbf9f4bf3952d5eca00c4cf3ffb44435502b8e..521b7fd42e33431c7ac20f3ef27395fa7a772cbc 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,23 @@ +2011-01-25 Sheriff Bot + + Unreviewed, rolling out r76625. + http://trac.webkit.org/changeset/76625 + https://bugs.webkit.org/show_bug.cgi?id=53119 + + "incorrect pixel test results" (Requested by rniwa on + #webkit). + + * 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.checksum: + * 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-25 Tony Chang Unreviewed, debugger-scripts.html is failing on windows too. diff --git a/LayoutTests/editing/selection/caret-painting-after-paste-undo-rtl.html b/LayoutTests/editing/selection/caret-painting-after-paste-undo-rtl.html deleted file mode 100644 index 14d3f63ba7718928c29b38f26937c292787cf4db..0000000000000000000000000000000000000000 --- a/LayoutTests/editing/selection/caret-painting-after-paste-undo-rtl.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -
To run this test, copy some text, paste it into the box below, and then undo. - The caret should be positioned respecting the box's border and padding.

-
-
- - diff --git a/LayoutTests/editing/selection/caret-painting-after-paste-undo.html b/LayoutTests/editing/selection/caret-painting-after-paste-undo.html deleted file mode 100644 index db83154988407c7d8a98f472f7a8981355cbab47..0000000000000000000000000000000000000000 --- a/LayoutTests/editing/selection/caret-painting-after-paste-undo.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -
To run this test, copy some text, paste it into the box below, and then undo. - The caret should be positioned respecting the box's border and padding.

-
-
- - diff --git a/LayoutTests/platform/mac/editing/deleting/5408255-expected.checksum b/LayoutTests/platform/mac/editing/deleting/5408255-expected.checksum index fbca6e5d28ada9a5dda2f9f6aeeef5d8365d07ce..90ad43dccb4c4b78dfaf9bd4c43d7441c15e596a 100644 --- a/LayoutTests/platform/mac/editing/deleting/5408255-expected.checksum +++ b/LayoutTests/platform/mac/editing/deleting/5408255-expected.checksum @@ -1 +1 @@ -3d62e6dd2bd0bae57beed5f1d3101ca0 \ No newline at end of file +ca490445057281bd26f5cab7862bb9cb \ No newline at end of file diff --git a/LayoutTests/platform/mac/editing/deleting/5408255-expected.png b/LayoutTests/platform/mac/editing/deleting/5408255-expected.png index ac59a5c5872a5604442b302c28706e00cf51bba8..3d4ab0e8e7eb0fc0ba448fc7482ede465303905f 100644 Binary files a/LayoutTests/platform/mac/editing/deleting/5408255-expected.png and b/LayoutTests/platform/mac/editing/deleting/5408255-expected.png differ diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum b/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum deleted file mode 100644 index e2c38598310b1b3df8426c46d4b8eb5b0d33e060..0000000000000000000000000000000000000000 --- a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -c9d3f8bdb370e1321e835f10e57d0f12 \ No newline at end of file diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png b/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png deleted file mode 100644 index 74ebc633ab1dbdaef774fc8eb2b16c2ecfe77bd7..0000000000000000000000000000000000000000 Binary files a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png and /dev/null differ diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt b/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt deleted file mode 100644 index 9c8422f16160ccc2efd327a0fbb39061d9edadd1..0000000000000000000000000000000000000000 --- a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt +++ /dev/null @@ -1,32 +0,0 @@ -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document -EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -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 784x584 - RenderBlock {DIV} at (0,0) size 784x36 - RenderText {#text} at (0,0) size 761x36 - text run at (0,0) width 477: "To run this test, copy some text, paste it into the box below, and then undo. " - text run at (477,0) width 284: "The caret should be positioned respecting the" - text run at (0,18) width 164: "box's border and padding." - RenderBlock (anonymous) at (0,36) size 784x18 - RenderBR {BR} at (0,0) size 0x18 - RenderBlock {DIV} at (0,54) size 784x32 [border: (2px inset #EEEEEE)] - RenderText {#text} at (0,0) size 0x0 -caret: position 0 of child 4 {DIV} of body diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum b/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum deleted file mode 100644 index b1e140867ef6473817c0676d3b32f8768c61b0d3..0000000000000000000000000000000000000000 --- a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -648036b0929b7b02e5909f58dbc19196 \ No newline at end of file diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png b/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png deleted file mode 100644 index aab614f3ca503bbd9bc52da02814f0e832b08966..0000000000000000000000000000000000000000 Binary files a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png and /dev/null differ diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt b/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt deleted file mode 100644 index 9c8422f16160ccc2efd327a0fbb39061d9edadd1..0000000000000000000000000000000000000000 --- a/LayoutTests/platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt +++ /dev/null @@ -1,32 +0,0 @@ -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document -EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -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 784x584 - RenderBlock {DIV} at (0,0) size 784x36 - RenderText {#text} at (0,0) size 761x36 - text run at (0,0) width 477: "To run this test, copy some text, paste it into the box below, and then undo. " - text run at (477,0) width 284: "The caret should be positioned respecting the" - text run at (0,18) width 164: "box's border and padding." - RenderBlock (anonymous) at (0,36) size 784x18 - RenderBR {BR} at (0,0) size 0x18 - RenderBlock {DIV} at (0,54) size 784x32 [border: (2px inset #EEEEEE)] - RenderText {#text} at (0,0) size 0x0 -caret: position 0 of child 4 {DIV} of body diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 9e2f6a6673e64b8c5e411229547cac63d15f3be1..779b7dfd11ca9b3667678349c5f3dca11bbce317 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2011-01-25 Sheriff Bot + + Unreviewed, rolling out r76625. + http://trac.webkit.org/changeset/76625 + https://bugs.webkit.org/show_bug.cgi?id=53119 + + "incorrect pixel test results" (Requested by rniwa on + #webkit). + + * rendering/RenderBox.cpp: + (WebCore::RenderBox::localCaretRect): + 2011-01-25 Patrick Gansterer Unreviewed WinCE build fix for r76614. diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp index a76243035de75c67af763aced539ebc2fe7fc2ac..86ba3747b170f77a55b975787ab2ccb6d8b50a88 100644 --- a/Source/WebCore/rendering/RenderBox.cpp +++ b/Source/WebCore/rendering/RenderBox.cpp @@ -2954,20 +2954,13 @@ 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 ((!caretOffset) ^ ltr) rect.move(IntSize(width() - caretWidth, 0)); - 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 (box) { RootInlineBox* rootBox = box->root(); int top = rootBox->lineTop();