[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 13:34:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5f766164c90f9298a1dcc4ac12e3f02973857583
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 20 17:44:04 2010 +0000
2010-09-20 Martin Robinson <mrobinson at igalia.com>
Reviewed by Daniel Bates.
[GTK] fast/forms/listbox-selection.html fails
https://bugs.webkit.org/show_bug.cgi?id=45942
* platform/gtk/Skipped: Unskip test which is now passing.
* platform/gtk/fast/events/keydown-1-expected.txt: Added.
2010-09-20 Martin Robinson <mrobinson at igalia.com>
Reviewed by Daniel Bates.
[GTK] fast/forms/listbox-selection.html fails
https://bugs.webkit.org/show_bug.cgi?id=45942
Use the gdkModifersFromJSValue helper to parse all appropriate modifier
strings in keyDownCallback.
* DumpRenderTree/gtk/EventSender.cpp:
(keyDownCallback): Use the gdkModifersFromJSValue instead of duplicating the
modifier parsing logic.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67860 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e1ce16e..8456964 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-20 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Daniel Bates.
+
+ [GTK] fast/forms/listbox-selection.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=45942
+
+ * platform/gtk/Skipped: Unskip test which is now passing.
+ * platform/gtk/fast/events/keydown-1-expected.txt: Added.
+
2010-09-20 Dimitri Glazkov <dglazkov at chromium.org>
Update a win-xp-specific baseline.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index e37817a..7710298 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1166,7 +1166,6 @@ fast/forms/get-file-upload.html
fast/forms/input-file-re-render.html
fast/forms/legend-access-key.html
fast/forms/listbox-onchange.html
-fast/forms/listbox-selection.html
fast/forms/onchange-enter-submit.html
fast/forms/onselect-textarea.html
fast/forms/onselect-textfield.html
@@ -1918,7 +1917,6 @@ fast/events/autoscroll.html
fast/events/context-no-deselect.html
fast/events/event-listener-on-link.html
fast/events/focusingUnloadedFrame.html
-fast/events/keydown-1.html
fast/events/label-focus.html
fast/events/onload-re-entry.html
fast/events/onloadFrameCrash.html
diff --git a/LayoutTests/platform/gtk/fast/events/keydown-1-expected.txt b/LayoutTests/platform/gtk/fast/events/keydown-1-expected.txt
new file mode 100644
index 0000000..8f21737
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/events/keydown-1-expected.txt
@@ -0,0 +1,31 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x576
+ RenderBlock {P} at (0,0) size 784x60
+ RenderText {#text} at (0,0) size 779x60
+ text run at (0,0) width 758: "This tests that keydown events aren't sent to the main frame for command key presses that occur when a subframe is first"
+ text run at (0,20) width 70: "responder. "
+ text run at (70,20) width 654: "To run it manually, click inside the subframe, type a few characters, then do Command-A to Select All. "
+ text run at (724,20) width 55: "Only the"
+ text run at (0,40) width 261: "subframe should report a keydown event."
+ RenderBlock (anonymous) at (0,76) size 784x152
+ RenderPartObject {IFRAME} at (0,0) size 302x152 [border: (1px solid #000000)]
+ layer at (0,0) size 300x150
+ RenderView at (0,0) size 300x150
+ layer at (0,0) size 300x150
+ RenderBlock {HTML} at (0,0) size 300x150
+ RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
+ RenderText {#text} at (0,0) size 270x20
+ text run at (0,0) width 270: "This sentence should not end with a period"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {UL} at (0,244) size 784x40
+ RenderListItem {LI} at (40,0) size 744x20
+ RenderListMarker at (-18,0) size 7x20: bullet
+ RenderText {#text} at (0,0) size 297x20
+ text run at (0,0) width 297: "keydown in subframe: [object KeyboardEvent]"
+ RenderListItem {LI} at (40,20) size 744x20
+ RenderListMarker at (-18,0) size 7x20: bullet
+ RenderText {#text} at (0,0) size 297x20
+ text run at (0,0) width 297: "keydown in subframe: [object KeyboardEvent]"
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 48503e4..333dfd9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-20 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Daniel Bates.
+
+ [GTK] fast/forms/listbox-selection.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=45942
+
+ Use the gdkModifersFromJSValue helper to parse all appropriate modifier
+ strings in keyDownCallback.
+
+ * DumpRenderTree/gtk/EventSender.cpp:
+ (keyDownCallback): Use the gdkModifersFromJSValue instead of duplicating the
+ modifier parsing logic.
+
2010-09-19 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index 0e2e469..d1529db 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -458,30 +458,7 @@ static JSValueRef keyDownCallback(JSContextRef context, JSObjectRef function, JS
{
if (argumentCount < 1)
return JSValueMakeUndefined(context);
-
- static const JSStringRef lengthProperty = JSStringCreateWithUTF8CString("length");
-
- webkit_web_frame_layout(mainFrame);
-
- // handle modifier keys.
- int state = 0;
- if (argumentCount > 1) {
- JSObjectRef modifiersArray = JSValueToObject(context, arguments[1], exception);
- if (modifiersArray) {
- for (int i = 0; i < JSValueToNumber(context, JSObjectGetProperty(context, modifiersArray, lengthProperty, 0), 0); ++i) {
- JSValueRef value = JSObjectGetPropertyAtIndex(context, modifiersArray, i, 0);
- JSStringRef string = JSValueToStringCopy(context, value, 0);
- if (JSStringIsEqualToUTF8CString(string, "ctrlKey"))
- state |= GDK_CONTROL_MASK;
- else if (JSStringIsEqualToUTF8CString(string, "shiftKey"))
- state |= GDK_SHIFT_MASK;
- else if (JSStringIsEqualToUTF8CString(string, "altKey"))
- state |= GDK_MOD1_MASK;
-
- JSStringRelease(string);
- }
- }
- }
+ guint modifiers = argumentCount >= 2 ? gdkModifersFromJSValue(context, arguments[1]) : 0;
// handle location argument.
int location = DOM_KEY_LOCATION_STANDARD;
@@ -574,7 +551,7 @@ static JSValueRef keyDownCallback(JSContextRef context, JSObjectRef function, JS
else {
gdkKeySym = gdk_unicode_to_keyval(charCode);
if (WTF::isASCIIUpper(charCode))
- state |= GDK_SHIFT_MASK;
+ modifiers |= GDK_SHIFT_MASK;
}
}
}
@@ -587,7 +564,7 @@ static JSValueRef keyDownCallback(JSContextRef context, JSObjectRef function, JS
// create and send the event
GdkEvent* pressEvent = gdk_event_new(GDK_KEY_PRESS);
pressEvent->key.keyval = gdkKeySym;
- pressEvent->key.state = state;
+ pressEvent->key.state = modifiers;
pressEvent->key.window = gtk_widget_get_window(GTK_WIDGET(view));
g_object_ref(pressEvent->key.window);
#ifndef GTK_API_VERSION_2
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list