[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
adele at apple.com
adele at apple.com
Wed Apr 7 23:09:22 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit e794b07ac2f0ffd194faec4aa1ac061de84e5c27
Author: adele at apple.com <adele at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 27 18:54:00 2009 +0000
WebCore: REGRESSION (Safari 4.0.3-ToT): After pressing Shift-PageDown, pressing Shift-Up
extends the top of the selection upwards (but should shrink the selection instead)
<rdar://problem/7269075>
https://bugs.webkit.org/show_bug.cgi?id=29981
Patch by Enrica Casucci <enrica at apple.com> on 2009-10-27
Reviewed by Adele Peterson.
* editing/SelectionController.cpp:
(WebCore::SelectionController::modify): Added setting m_lastChangeWasHorizontalExtension.
LayoutTests: Test for <rdar://problem/7269075> REGRESSION (Safari 4.0.3-ToT): After pressing Shift-PageDown, pressing Shift-Up
extends the top of the selection upwards (but should shrink the selection instead)
https://bugs.webkit.org/show_bug.cgi?id=29981
* editing/selection/shrink-selection-after-shift-pagedown-expected.txt: Added.
* editing/selection/shrink-selection-after-shift-pagedown.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50165 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6807d77..050c87d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-27 Adele Peterson <adele at apple.com>
+
+ Test for <rdar://problem/7269075> REGRESSION (Safari 4.0.3-ToT): After pressing Shift-PageDown, pressing Shift-Up
+ extends the top of the selection upwards (but should shrink the selection instead)
+ https://bugs.webkit.org/show_bug.cgi?id=29981
+
+ * editing/selection/shrink-selection-after-shift-pagedown-expected.txt: Added.
+ * editing/selection/shrink-selection-after-shift-pagedown.html: Added.
+
2009-10-27 Keishi Hattori <casey.hattori at gmail.com>
Reviewed by Timothy Hatcher.
diff --git a/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown-expected.txt b/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown-expected.txt
new file mode 100644
index 0000000..e178da4
--- /dev/null
+++ b/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown-expected.txt
@@ -0,0 +1,6 @@
+This tests shrinking a selection with shift-up after extending it with shift-PageDown.
+
+This test does not run interactively. It uses the event sender to do mouse clicks. To run it manually, press shift-PagDown. Then press shift-up. The selection should only include the lines with "YES".
+
+
+SUCCESS: The selection shrunk correctly
diff --git a/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html b/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html
new file mode 100644
index 0000000..956d717
--- /dev/null
+++ b/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html
@@ -0,0 +1,55 @@
+<html>
+<head>
+<script>
+ function runTest()
+ {
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ var ta = document.getElementById('ta');
+ ta.setSelectionRange(3, 14);
+
+ if (window.eventSender) {
+ eventSender.keyDown("pageDown",["shiftKey"]);
+ eventSender.keyDown("upArrow",["shiftKey"]);
+ }
+
+ var result;
+ var selectedText = (ta.value).substring(ta.selectionStart, ta.selectionEnd);
+ if (selectedText.indexOf('NO') == -1)
+ result = "SUCCESS: The selection shrunk correctly";
+ else
+ result = "SUCCESS: The selected text is \"" + selectedText + "\".";
+ document.getElementById("result").firstChild.data = result;
+ }
+</script>
+</head>
+<body onload="runTest()">
+<p>This tests shrinking a selection with shift-up after extending it with shift-PageDown.</p>
+<p style="color:green">
+ This test does not run interactively.
+ It uses the event sender to do mouse clicks.
+ To run it manually, press shift-PagDown. Then press shift-up.
+ The selection should only include the lines with "YES".
+</p>
+<textarea rows=10 id="ta">
+NO
+YES
+YES
+YES
+YES
+YES
+YES
+YES
+YES
+YES
+NO
+NO
+NO
+NO
+NO
+NO
+NO
+</textarea>
+<p id="result">TEST HAS NOT RUN</p>
+</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c753dc2..3254aa6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-27 Enrica Casucci <enrica at apple.com>
+
+ Reviewed by Adele Peterson.
+
+ REGRESSION (Safari 4.0.3-ToT): After pressing Shift-PageDown, pressing Shift-Up
+ extends the top of the selection upwards (but should shrink the selection instead)
+ <rdar://problem/7269075>
+ https://bugs.webkit.org/show_bug.cgi?id=29981
+
+ * editing/SelectionController.cpp:
+ (WebCore::SelectionController::modify): Added setting m_lastChangeWasHorizontalExtension.
+
2009-10-27 Brian Weinstein <bweinstein at apple.com>
Rubber-stamped by Tim Hatcher.
diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp
index 7d99916..00672f2 100644
--- a/WebCore/editing/SelectionController.cpp
+++ b/WebCore/editing/SelectionController.cpp
@@ -725,6 +725,8 @@ bool SelectionController::modify(EAlteration alter, int verticalDistance, bool u
if (userTriggered)
m_frame->setSelectionGranularity(CharacterGranularity);
+ m_lastChangeWasHorizontalExtension = alter == EXTEND;
+
return true;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list