Title: [95550] trunk
- Revision
- 95550
- Author
- [email protected]
- Date
- 2011-09-20 09:46:56 -0700 (Tue, 20 Sep 2011)
Log Message
Unreviewed, rolling out r95509.
http://trac.webkit.org/changeset/95509
https://bugs.webkit.org/show_bug.cgi?id=68446
crashes chromium fast/repaint/japanese-rl-selection-repaint-
in-regions.html on Win and Linux (Requested by dslomov on
#webkit).
Patch by Sheriff Bot <[email protected]> on 2011-09-20
Source/WebCore:
* rendering/RenderBlock.cpp:
(WebCore::positionForPointRespectingEditingBoundaries):
LayoutTests:
* editing/selection/click-on-body-margin-expected.txt: Removed.
* editing/selection/click-on-body-margin.html: Removed.
* editing/selection/click-on-head-margin-expected.txt: Removed.
* editing/selection/click-on-head-margin.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (95549 => 95550)
--- trunk/LayoutTests/ChangeLog 2011-09-20 16:45:34 UTC (rev 95549)
+++ trunk/LayoutTests/ChangeLog 2011-09-20 16:46:56 UTC (rev 95550)
@@ -1,3 +1,18 @@
+2011-09-20 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r95509.
+ http://trac.webkit.org/changeset/95509
+ https://bugs.webkit.org/show_bug.cgi?id=68446
+
+ crashes chromium fast/repaint/japanese-rl-selection-repaint-
+ in-regions.html on Win and Linux (Requested by dslomov on
+ #webkit).
+
+ * editing/selection/click-on-body-margin-expected.txt: Removed.
+ * editing/selection/click-on-body-margin.html: Removed.
+ * editing/selection/click-on-head-margin-expected.txt: Removed.
+ * editing/selection/click-on-head-margin.html: Removed.
+
2011-09-20 Jarred Nicholls <[email protected]>
[Qt] Permit qrc resources to load in QWebSettings::setUserStyleSheetUrl()
Deleted: trunk/LayoutTests/editing/selection/click-on-body-margin-expected.txt (95549 => 95550)
--- trunk/LayoutTests/editing/selection/click-on-body-margin-expected.txt 2011-09-20 16:45:34 UTC (rev 95549)
+++ trunk/LayoutTests/editing/selection/click-on-body-margin-expected.txt 2011-09-20 16:46:56 UTC (rev 95550)
@@ -1,4 +0,0 @@
-Click on the right of this line outside the black box.
-The caret should be placed on the right of the first line, NOT on the right of this line.
-PASS
-
Deleted: trunk/LayoutTests/editing/selection/click-on-body-margin.html (95549 => 95550)
--- trunk/LayoutTests/editing/selection/click-on-body-margin.html 2011-09-20 16:45:34 UTC (rev 95549)
+++ trunk/LayoutTests/editing/selection/click-on-body-margin.html 2011-09-20 16:46:56 UTC (rev 95550)
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body style="white-space: nowrap; margin:100px; border: solid 1px black;" contenteditable>
-<span id="firstLine">Click on the right of this line outside the black box.</span><br>
-<span id="longLine">The caret should be placed on the right of the first line, NOT on the right of this line.
-<span></span></span>
-<pre><script>
-
-var longLine = document.getElementById('longLine');
-while (longLine.offsetWidth < document.body.offsetWidth + 200)
- longLine.lastChild.textContent += ' some text';
-
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
-
- var firstLine = document.getElementById('firstLine');
- eventSender.mouseMoveTo(firstLine.offsetLeft + document.body.offsetWidth + 10,
- firstLine.offsetTop + firstLine.offsetHeight / 2);
- eventSender.mouseDown();
- eventSender.mouseUp();
-
- if (!getSelection().isCollapsed)
- document.writeln('FAIL - selection was not collapsed');
- else if (getSelection().baseNode != firstLine.firstChild)
- document.writeln('FAIL - caret was not in the first line');
- else if (getSelection().baseOffset != firstLine.textContent.length)
- document.writeln('FAIL - caret was not on the right edge');
- else
- document.writeln('PASS');
-
- longLine.lastChild.style.display = 'none';
-}
-
-</script></pre>
-</body>
-</html>
Deleted: trunk/LayoutTests/editing/selection/click-on-head-margin-expected.txt (95549 => 95550)
--- trunk/LayoutTests/editing/selection/click-on-head-margin-expected.txt 2011-09-20 16:45:34 UTC (rev 95549)
+++ trunk/LayoutTests/editing/selection/click-on-head-margin-expected.txt 2011-09-20 16:46:56 UTC (rev 95550)
@@ -1,4 +0,0 @@
-Click on the right of this line outside the black box.
-The caret should be placed on the right of the first line, NOT on the right of this line.
- PASS
-
Deleted: trunk/LayoutTests/editing/selection/click-on-head-margin.html (95549 => 95550)
--- trunk/LayoutTests/editing/selection/click-on-head-margin.html 2011-09-20 16:45:34 UTC (rev 95549)
+++ trunk/LayoutTests/editing/selection/click-on-head-margin.html 2011-09-20 16:46:56 UTC (rev 95550)
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head contenteditable style="display: block; white-space: nowrap; margin:100px; border: solid 1px black;"></head>
-<body>
-<div id="firstLine">Click on the right of this line outside the black box.</div>
-<span id="longLine">The caret should be placed on the right of the first line, NOT on the right of this line.<span></span></span>
-<pre><script>
-
-var head = document.getElementsByTagName('head')[0];
-var longLine = document.getElementById('longLine');
-var firstLine = document.getElementById('firstLine');
-
-// Work-around HTML5 parser.
-head.appendChild(firstLine);
-head.appendChild(longLine);
-
-while (longLine.offsetWidth < head.offsetWidth + 200)
- longLine.lastChild.textContent += ' some text';
-
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
-
- eventSender.mouseMoveTo(100 + head.offsetWidth + 10, 100 + firstLine.offsetHeight / 2);
- eventSender.mouseDown();
- eventSender.mouseUp();
-
- if (!getSelection().isCollapsed)
- document.writeln('FAIL - selection was not collapsed');
- else if (getSelection().baseNode != firstLine.firstChild)
- document.writeln('FAIL - caret was not in the first line');
- else if (getSelection().baseOffset != firstLine.textContent.length)
- document.writeln('FAIL - caret was not on the right edge');
- else
- document.writeln('PASS');
-
- longLine.lastChild.style.display = 'none';
-}
-
-</script></pre>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (95549 => 95550)
--- trunk/Source/WebCore/ChangeLog 2011-09-20 16:45:34 UTC (rev 95549)
+++ trunk/Source/WebCore/ChangeLog 2011-09-20 16:46:56 UTC (rev 95550)
@@ -1,3 +1,16 @@
+2011-09-20 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r95509.
+ http://trac.webkit.org/changeset/95509
+ https://bugs.webkit.org/show_bug.cgi?id=68446
+
+ crashes chromium fast/repaint/japanese-rl-selection-repaint-
+ in-regions.html on Win and Linux (Requested by dslomov on
+ #webkit).
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::positionForPointRespectingEditingBoundaries):
+
2011-09-20 Jarred Nicholls <[email protected]>
[Qt] Permit qrc resources to load in QWebSettings::setUserStyleSheetUrl()
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (95549 => 95550)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-09-20 16:45:34 UTC (rev 95549)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-09-20 16:46:56 UTC (rev 95550)
@@ -4232,7 +4232,7 @@
ancestor = ancestor->parent();
// If we can't find an ancestor to check editability on, or editability is unchanged, we recur like normal
- if (!ancestor || (ancestor->hasLayer() && ancestor->parent()->isRenderView()) || ancestor->node()->rendererIsEditable() == childNode->rendererIsEditable())
+ if (!ancestor || ancestor->node()->rendererIsEditable() == childNode->rendererIsEditable())
return child->positionForPoint(pointInChildCoordinates);
// Otherwise return before or after the child, depending on if the click was to the logical left or logical right of the child
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
