[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yael.aharon at nokia.com
yael.aharon at nokia.com
Wed Dec 22 14:31:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 887618aabd73b64e5b8e1e974a1189a8de0e7daa
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 12 14:47:24 2010 +0000
2010-10-12 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Antonio Gomes.
[Qt] Editing commands should not be executed on non-editable content.
https://bugs.webkit.org/show_bug.cgi?id=47426
* fast/events/scroll-after-click-on-tab-index-expected.txt: Added.
* fast/events/scroll-after-click-on-tab-index.html: Added.
2010-10-12 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Antonio Gomes.
[Qt] Editing commands should not be executed on non-editable content.
https://bugs.webkit.org/show_bug.cgi?id=47426
Remove calls to editor()->command() when we are not in editable content.
There is no value in doing that, and in some cases, it prevents scrolling.
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::handleKeyboardEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69582 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6efcc16..d7e6676 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-12 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] Editing commands should not be executed on non-editable content.
+ https://bugs.webkit.org/show_bug.cgi?id=47426
+
+ * fast/events/scroll-after-click-on-tab-index-expected.txt: Added.
+ * fast/events/scroll-after-click-on-tab-index.html: Added.
+
2010-10-12 Alexander Pavlov <apavlov at chromium.org>
[Chromium] Unreviewed, clean up chromium-win SVG test expectations.
diff --git a/LayoutTests/fast/events/scroll-after-click-on-tab-index-expected.txt b/LayoutTests/fast/events/scroll-after-click-on-tab-index-expected.txt
new file mode 100644
index 0000000..3222b68
--- /dev/null
+++ b/LayoutTests/fast/events/scroll-after-click-on-tab-index-expected.txt
@@ -0,0 +1,44 @@
+ALERT: Scroll position 0
+Click the text below and then try to scroll.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Scroll position is more than 0
+PASS document.body.scrollTop > 0 is true
+
+
+
+
+
+
+
+
+
+
+My span
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LayoutTests/fast/events/scroll-after-click-on-tab-index.html b/LayoutTests/fast/events/scroll-after-click-on-tab-index.html
new file mode 100644
index 0000000..716e65d
--- /dev/null
+++ b/LayoutTests/fast/events/scroll-after-click-on-tab-index.html
@@ -0,0 +1,50 @@
+<html>
+<script src="../js/resources/js-test-pre.js"></script>
+<script>
+function getCenterFor(element)
+{
+ var rect = element.getBoundingClientRect();
+ return { x : parseInt((rect.left + rect.right) / 2) , y : parseInt((rect.top + rect.bottom) / 2)};
+}
+
+function runTest()
+{
+ if (!window.layoutTestController)
+ return;
+ if (!window.eventSender)
+ return;
+
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpAsText();
+
+ alert("Scroll position " + document.body.scrollTop);
+ center = getCenterFor(document.getElementById("sp"));
+ eventSender.mouseMoveTo(center.x, center.y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ eventSender.keyDown("downArrow");
+ setTimeout(verifyScrolling, 15);
+}
+
+function verifyScrolling()
+{
+ debug("Scroll position is more than 0");
+ shouldBe("document.body.scrollTop > 0", "true");
+ layoutTestController.notifyDone();
+}
+
+var successfullyParsed = true;
+
+</script>
+<style>
+</style>
+<body onload="runTest();">
+<input type="radio" id="myradio">Click the text below and then try to scroll.<br>
+<div id="console"></div>
+<script src="../js/resources/js-test-post.js"></script>
+<br><br><br><br><br><br><br><br><br><br>
+<span tabindex=1 id="sp">My span</span>
+<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+</body>
+</html>
+
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index c252b7e..124dac2 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-12 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] Editing commands should not be executed on non-editable content.
+ https://bugs.webkit.org/show_bug.cgi?id=47426
+
+ Remove calls to editor()->command() when we are not in editable content.
+ There is no value in doing that, and in some cases, it prevents scrolling.
+
+ * WebCoreSupport/EditorClientQt.cpp:
+ (WebCore::EditorClientQt::handleKeyboardEvent):
+
2010-10-08 Hui Huang <hui.2.huang at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
index 9db4333..2dd3b37 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
@@ -457,39 +457,7 @@ void EditorClientQt::handleKeyboardEvent(KeyboardEvent* event)
m_page->triggerAction(QWebPage::Copy);
else
#endif // QT_NO_SHORTCUT
- switch (kevent->windowsVirtualKeyCode()) {
- case VK_UP:
- frame->editor()->command("MoveUp").execute();
- break;
- case VK_DOWN:
- frame->editor()->command("MoveDown").execute();
- break;
- case VK_PRIOR: // PageUp
- frame->editor()->command("MovePageUp").execute();
- break;
- case VK_NEXT: // PageDown
- frame->editor()->command("MovePageDown").execute();
- break;
- case VK_HOME:
- if (kevent->ctrlKey())
- frame->editor()->command("MoveToBeginningOfDocument").execute();
- break;
- case VK_END:
- if (kevent->ctrlKey())
- frame->editor()->command("MoveToEndOfDocument").execute();
- break;
- default:
- if (kevent->ctrlKey()) {
- switch (kevent->windowsVirtualKeyCode()) {
- case VK_A:
- frame->editor()->command("SelectAll").execute();
- break;
- default:
- return;
- }
- } else
- return;
- }
+ return;
}
event->setDefaultHandled();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list