From b73a8d421b87420045b617e09611b91570d891a4 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Tue, 20 Sep 2011 16:46:56 +0000 Subject: [PATCH] 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 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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95550 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 15 ++++++++ .../selection/click-on-body-margin-expected.txt | 4 --- .../editing/selection/click-on-body-margin.html | 36 ------------------- .../selection/click-on-head-margin-expected.txt | 4 --- .../editing/selection/click-on-head-margin.html | 41 ---------------------- Source/WebCore/ChangeLog | 13 +++++++ Source/WebCore/rendering/RenderBlock.cpp | 2 +- 7 files changed, 29 insertions(+), 86 deletions(-) delete mode 100644 LayoutTests/editing/selection/click-on-body-margin-expected.txt delete mode 100644 LayoutTests/editing/selection/click-on-body-margin.html delete mode 100644 LayoutTests/editing/selection/click-on-head-margin-expected.txt delete mode 100644 LayoutTests/editing/selection/click-on-head-margin.html diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 18cab82..7a90e23 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,18 @@ +2011-09-20 Sheriff Bot + + 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 [Qt] Permit qrc resources to load in QWebSettings::setUserStyleSheetUrl() diff --git a/LayoutTests/editing/selection/click-on-body-margin-expected.txt b/LayoutTests/editing/selection/click-on-body-margin-expected.txt deleted file mode 100644 index a1aeb55..0000000 --- a/LayoutTests/editing/selection/click-on-body-margin-expected.txt +++ /dev/null @@ -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 - diff --git a/LayoutTests/editing/selection/click-on-body-margin.html b/LayoutTests/editing/selection/click-on-body-margin.html deleted file mode 100644 index 64f5a75..0000000 --- a/LayoutTests/editing/selection/click-on-body-margin.html +++ /dev/null @@ -1,36 +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. - -

- - diff --git a/LayoutTests/editing/selection/click-on-head-margin-expected.txt b/LayoutTests/editing/selection/click-on-head-margin-expected.txt deleted file mode 100644 index 92e2f9b..0000000 --- a/LayoutTests/editing/selection/click-on-head-margin-expected.txt +++ /dev/null @@ -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 - diff --git a/LayoutTests/editing/selection/click-on-head-margin.html b/LayoutTests/editing/selection/click-on-head-margin.html deleted file mode 100644 index 25d0c87..0000000 --- a/LayoutTests/editing/selection/click-on-head-margin.html +++ /dev/null @@ -1,41 +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. -

- - diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index fc9fce9..83221ce 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2011-09-20 Sheriff Bot + + 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 [Qt] Permit qrc resources to load in QWebSettings::setUserStyleSheetUrl() diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 12d78ba..3510b20 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -4232,7 +4232,7 @@ static VisiblePosition positionForPointRespectingEditingBoundaries(RenderBlock* 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 -- 2.7.4