[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:44:06 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 5ba50ddf9293e8f2b6777d62703de1ba0c14e2ba
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 20 16:26:17 2009 +0000
2009-12-20 Alejandro G. Castro <alex at igalia.com>
Reviewed by Gustavo Noronha Silva.
[GTK] Failing test platform/gtk/editing/pasteboard/middle-button-paste.html
https://bugs.webkit.org/show_bug.cgi?id=32788
Avoid using fixed values when moving mouse.
* platform/gtk/editing/pasteboard/middle-button-paste-expected.txt:
* platform/gtk/editing/pasteboard/middle-button-paste.html:
2009-12-20 Alejandro G. Castro <alex at igalia.com>
Reviewed by Gustavo Noronha Silva.
[GTK] Failing test platform/gtk/editing/pasteboard/middle-button-paste.html
https://bugs.webkit.org/show_bug.cgi?id=32788
Do not increase the click count if we are using a different button.
* DumpRenderTree/gtk/EventSender.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52419 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aac8163..2c662d9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Gustavo Noronha Silva.
+ [GTK] Failing test platform/gtk/editing/pasteboard/middle-button-paste.html
+ https://bugs.webkit.org/show_bug.cgi?id=32788
+
+ Avoid using fixed values when moving mouse.
+
+ * platform/gtk/editing/pasteboard/middle-button-paste-expected.txt:
+ * platform/gtk/editing/pasteboard/middle-button-paste.html:
+
+2009-12-20 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
* platform/gtk/editing/pasteboard/middle-button-paste-expected.txt:
* platform/gtk/editing/pasteboard/middle-button-paste.html:
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt
index 78b3234..43f5326 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt
@@ -1,3 +1,3 @@
-Select me, select me, selSelect me, sect me
+Select me, select me, select meSelect me, select me, select me
-The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, selecSelect mt me, select me"
+The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, select me, select meSelect me, select me, select me"
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html
index a08a0f2..5d4ecd0 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html
+++ b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html
@@ -22,9 +22,11 @@ function runTest()
eventSender.mouseDown();
eventSender.mouseMoveTo(x, y);
- eventSender.mouseMoveTo(x + 50, y);
+ eventSender.mouseMoveTo(x, y + target.offsetHeight);
+ eventSender.mouseUp();
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
eventSender.mouseUp();
- eventSender.mouseMoveTo(x + 100, y);
eventSender.mouseDown(1);
eventSender.mouseUp(1);
}
@@ -32,10 +34,9 @@ function runTest()
</script>
</head>
<body onload="runTest()">
-<div style="font-size: 10px" id="text" contenteditable>Select me, select me, select me</div>
+<div id="text" contenteditable>Select me, select me, select me</div>
<br/>
-<p>The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, selecSelect mt me, select me"</p>
+<p>The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, select me, select meSelect me, select me, select me"</p>
</body>
</html>
-
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0cc662a..7fdd303 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-20 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] Failing test platform/gtk/editing/pasteboard/middle-button-paste.html
+ https://bugs.webkit.org/show_bug.cgi?id=32788
+
+ Do not increase the click count if we are using a different button.
+
+ * DumpRenderTree/gtk/EventSender.cpp:
+
2009-12-20 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index 6268b5b..3b7311b 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -120,10 +120,10 @@ static JSValueRef contextClickCallback(JSContextRef context, JSObjectRef functio
return JSValueMakeUndefined(context);
}
-static void updateClickCount(int /* button */)
+static void updateClickCount(int button)
{
// FIXME: take the last clicked button number and the time of last click into account.
- if (lastClickPositionX != lastMousePositionX || lastClickPositionY != lastMousePositionY)
+ if (lastClickPositionX != lastMousePositionX || lastClickPositionY != lastMousePositionY || currentEventButton != button)
clickCount = 1;
else
clickCount++;
@@ -180,7 +180,7 @@ static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function,
event.button.x_root = x_root;
event.button.y_root = y_root;
- updateClickCount(1);
+ updateClickCount(event.button.button);
if (!msgQueue[endOfQueue].delay) {
webkit_web_frame_layout(mainFrame);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list