[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
dimich at chromium.org
dimich at chromium.org
Sun Feb 20 23:22:15 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 16454021ac17c508be8f7c4334f4fc5fe6e837cf
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 04:24:05 2011 +0000
2011-01-19 Sheriff Bot <webkit.review.bot at 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 at 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
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c358971..df7156b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-19 Sheriff Bot <webkit.review.bot at 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 at google.com>
Reviewed by Kent Tamura.
diff --git a/LayoutTests/editing/selection/caret-painting-in-overflowing-autowrap-content.html b/LayoutTests/editing/selection/caret-painting-in-overflowing-autowrap-content.html
deleted file mode 100644
index 2c8a157..0000000
--- a/LayoutTests/editing/selection/caret-painting-in-overflowing-autowrap-content.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
diff --git a/LayoutTests/editing/selection/resources/iframe-positioning-caret-at-end.html b/LayoutTests/editing/selection/resources/iframe-positioning-caret-at-end.html
deleted file mode 100644
index 172bb5d..0000000
--- a/LayoutTests/editing/selection/resources/iframe-positioning-caret-at-end.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.checksum b/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.checksum
deleted file mode 100644
index 5095432..0000000
--- a/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-49ab6961807b5cfbcb441bdf6ee124a4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.png b/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.png
deleted file mode 100644
index d6c5411..0000000
Binary files a/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt b/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt
deleted file mode 100644
index 4a2c622..0000000
--- a/LayoutTests/platform/mac/editing/selection/caret-painting-in-overflowing-autowrap-content-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-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."
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e8d77d5..99b88b4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-19 Sheriff Bot <webkit.review.bot at 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 at google.com>
Reviewed by Kent Tamura.
diff --git a/Source/WebCore/rendering/RenderText.cpp b/Source/WebCore/rendering/RenderText.cpp
index ae155ee..58c41ab 100644
--- a/Source/WebCore/rendering/RenderText.cpp
+++ b/Source/WebCore/rendering/RenderText.cpp
@@ -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;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list