[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
rniwa at webkit.org
rniwa at webkit.org
Mon Feb 21 00:06:33 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 6419648e2180a3f720cc7df63babb51147536b32
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 03:30:24 2011 +0000
2011-01-27 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed, rolling out r76839.
http://trac.webkit.org/changeset/76839
https://bugs.webkit.org/show_bug.cgi?id=49744
broke pixel tests
* rendering/RenderBox.cpp:
(WebCore::RenderBox::localCaretRect):
2011-01-27 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed, rolling out r76839.
http://trac.webkit.org/changeset/76839
https://bugs.webkit.org/show_bug.cgi?id=49744
broke pixel tests
* 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.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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76911 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d4b9f54..f5216d8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-27 Ryosuke Niwa <rniwa at webkit.org>
+
+ Unreviewed, rolling out r76839.
+ http://trac.webkit.org/changeset/76839
+ https://bugs.webkit.org/show_bug.cgi?id=49744
+
+ broke pixel tests
+
+ * 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.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-27 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin Adler.
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 14d3f63..0000000
--- a/LayoutTests/editing/selection/caret-painting-after-paste-undo-rtl.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<script src="../editing.js" language="JavaScript" type="text/JavaScript"></script>
-<script>
-function editingTest() {
- doubleClick(0, 0);
- copyCommand();
- var editor = document.getElementById("editor");
- editor.focus();
- pasteCommand();
- undoCommand();
-}
-</script>
-</head>
-<body onLoad="runEditingTest();">
-<div>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.</div><br>
-<div id="editor" contenteditable=true style="direction: rtl; border:2px inset #eee; padding: 5px;">
-</div>
-</body>
-</html>
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 db83154..0000000
--- a/LayoutTests/editing/selection/caret-painting-after-paste-undo.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<script src="../editing.js" language="JavaScript" type="text/JavaScript"></script>
-<script>
-function editingTest() {
- doubleClick(0, 0);
- copyCommand();
- var editor = document.getElementById("editor");
- editor.focus();
- pasteCommand();
- undoCommand();
-}
-</script>
-</head>
-<body onLoad="runEditingTest();">
-<div>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.</div><br>
-<div id="editor" contenteditable=true style="border:2px inset #eee; padding: 5px;">
-</div>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/editing/deleting/5408255-expected.png b/LayoutTests/platform/mac/editing/deleting/5408255-expected.png
index ac59a5c..3d4ab0e 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 e2c3859..0000000
--- 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 74ebc63..0000000
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 9c8422f..0000000
--- 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 b1e1408..0000000
--- 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 aab614f..0000000
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 9c8422f..0000000
--- 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 61f006e..ff9b10a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-27 Ryosuke Niwa <rniwa at webkit.org>
+
+ Unreviewed, rolling out r76839.
+ http://trac.webkit.org/changeset/76839
+ https://bugs.webkit.org/show_bug.cgi?id=49744
+
+ broke pixel tests
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::localCaretRect):
+
2011-01-27 Emil A Eklund <eae at chromium.org>
Reviewed by Darin Adler.
diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
index 8545bf4..9428519 100644
--- a/Source/WebCore/rendering/RenderBox.cpp
+++ b/Source/WebCore/rendering/RenderBox.cpp
@@ -2960,16 +2960,12 @@ 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 (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 ((!caretOffset) ^ ltr)
+ rect.move(IntSize(width() - caretWidth, 0));
if (box) {
RootInlineBox* rootBox = box->root();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list