Diff
Modified: trunk/LayoutTests/ChangeLog (87854 => 87855)
--- trunk/LayoutTests/ChangeLog 2011-06-01 21:55:43 UTC (rev 87854)
+++ trunk/LayoutTests/ChangeLog 2011-06-01 21:57:05 UTC (rev 87855)
@@ -1,3 +1,17 @@
+2011-06-01 Noel Gordon <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ Test plugin should support event logging on the windows port.
+ https://bugs.webkit.org/show_bug.cgi?id=61721
+
+ * platform/chromium-win/plugins/keyboard-events-expected.txt: New windows result.
+ * platform/chromium/test_expectations.txt: New expectations.
+ * plugins/keyboard-events.html: Add attribute windowPlugin="false" to force the
+ Chromium windows port to load the test plugin in windowless mode. The plugin will
+ then receive events and can log them to the console as required by this test.
+ * plugins/mouse-events.html: Ditto.
+
2011-06-01 Adam Barth <[email protected]>
... and finally Windows.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (87854 => 87855)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-01 21:55:43 UTC (rev 87854)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-01 21:57:05 UTC (rev 87855)
@@ -762,7 +762,7 @@
BUGWK48164 MAC LINUX WIN : plugins/invalid-mime-with-valid-extension-shows-missing-plugin.html = TEXT
// Need to implement NPP_HandleEvent in the layout_test_plugin
// WIN started failing during webkit roll 62670 -> 62844.
-BUGCR38353 : plugins/keyboard-events.html = TEXT
+BUGCR38353 MAC LINUX: plugins/keyboard-events.html = TEXT
BUGCR10351 MAC : plugins/mouse-events.html = FAIL
BUGCR32864 MAC LINUX : plugins/mouse-events-fixedpos.html = TEXT
BUGCR35822 : plugins/npruntime/browser-object-identity.html = TEXT
@@ -783,7 +783,6 @@
// switch.
BUG_TONY WIN : plugins/geturlnotify-during-document-teardown.html = CRASH
BUGWK48655 : plugins/js-from-destroy.html = CRASH PASS
-BUG_TONY WIN : plugins/mouse-events.html = TEXT
BUG_TONY WIN : plugins/plugin-initiate-popup-window.html = TIMEOUT
// This test is failing because the plugin has changed names on Windows to
// match the name of the plugin upstream.
Modified: trunk/LayoutTests/platform/chromium-win/plugins/keyboard-events-expected.txt (87854 => 87855)
--- trunk/LayoutTests/platform/chromium-win/plugins/keyboard-events-expected.txt 2011-06-01 21:55:43 UTC (rev 87854)
+++ trunk/LayoutTests/platform/chromium-win/plugins/keyboard-events-expected.txt 2011-06-01 21:57:05 UTC (rev 87855)
@@ -1,8 +1,11 @@
-CONSOLE MESSAGE: line 17: PLUGIN: getFocusEvent
-CONSOLE MESSAGE: line 17: PLUGIN: mouseDown at (20, 20)
-CONSOLE MESSAGE: line 18: PLUGIN: mouseUp at (20, 20)
-CONSOLE MESSAGE: line 21: PLUGIN: keyUp 'A'
-CONSOLE MESSAGE: line 22: PLUGIN: keyUp 'B'
-CONSOLE MESSAGE: line 23: PLUGIN: keyUp 'C'
+CONSOLE MESSAGE: line 18: PLUGIN: getFocusEvent
+CONSOLE MESSAGE: line 18: PLUGIN: mouseDown at (20, 20)
+CONSOLE MESSAGE: line 19: PLUGIN: mouseUp at (20, 20)
+CONSOLE MESSAGE: line 22: PLUGIN: keyDown 'A'
+CONSOLE MESSAGE: line 22: PLUGIN: keyUp 'A'
+CONSOLE MESSAGE: line 23: PLUGIN: keyDown 'B'
+CONSOLE MESSAGE: line 23: PLUGIN: keyUp 'B'
+CONSOLE MESSAGE: line 24: PLUGIN: keyDown 'C'
+CONSOLE MESSAGE: line 24: PLUGIN: keyUp 'C'
This test checks if a plug-in can receive keyboard events sent from eventSender. This is a test for Bug 34936.
Modified: trunk/LayoutTests/plugins/keyboard-events.html (87854 => 87855)
--- trunk/LayoutTests/plugins/keyboard-events.html 2011-06-01 21:55:43 UTC (rev 87854)
+++ trunk/LayoutTests/plugins/keyboard-events.html 2011-06-01 21:57:05 UTC (rev 87855)
@@ -1,6 +1,6 @@
<html>
<body>
-<embed name="plg" type="application/x-webkit-test-netscape" width=100 height=100></embed>
+<embed name="plg" type="application/x-webkit-test-netscape" windowedPlugin="false" width=100 height=100></embed>
<p>This test checks if a plug-in can receive keyboard events sent from eventSender. This is a test for <a href="" 34936</a>.</p>
<script>
Modified: trunk/LayoutTests/plugins/mouse-events.html (87854 => 87855)
--- trunk/LayoutTests/plugins/mouse-events.html 2011-06-01 21:55:43 UTC (rev 87854)
+++ trunk/LayoutTests/plugins/mouse-events.html 2011-06-01 21:57:05 UTC (rev 87855)
@@ -1,6 +1,6 @@
<html>
<body>
-<embed name="plg" type="application/x-webkit-test-netscape" width=100 height=100></embed>
+<embed name="plg" type="application/x-webkit-test-netscape" windowedPlugin="false" width=100 height=100></embed>
<p>Test for <a href="" 11517</a>:
Flash clicks/interactivity not working properly.</p>
<script>
Modified: trunk/Tools/ChangeLog (87854 => 87855)
--- trunk/Tools/ChangeLog 2011-06-01 21:55:43 UTC (rev 87854)
+++ trunk/Tools/ChangeLog 2011-06-01 21:57:05 UTC (rev 87855)
@@ -1,3 +1,13 @@
+2011-06-01 Noel Gordon <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ Test plugin should support event logging on the windows port.
+ https://bugs.webkit.org/show_bug.cgi?id=61721
+
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ (handleEventWin): Well, handle them.
+
2011-06-01 Daniel Cheng <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (87854 => 87855)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2011-06-01 21:55:43 UTC (rev 87854)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2011-06-01 21:57:05 UTC (rev 87855)
@@ -688,6 +688,45 @@
if (obj->onPaintEvent)
executeScript(obj, obj->onPaintEvent);
return 1;
+ case WM_KEYDOWN:
+ if (obj->eventLogging)
+ pluginLog(instance, "keyDown '%c'", event->wParam);
+ if (obj->evaluateScriptOnMouseDownOrKeyDown && !obj->mouseDownForEvaluateScript)
+ executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
+ return 1;
+ case WM_CHAR:
+ return 1;
+ case WM_KEYUP:
+ if (obj->eventLogging)
+ pluginLog(instance, "keyUp '%c'", event->wParam);
+ if (obj->testKeyboardFocusForPlugins) {
+ obj->eventLogging = false;
+ obj->testKeyboardFocusForPlugins = FALSE;
+ executeScript(obj, "layoutTestController.notifyDone();");
+ }
+ return 1;
+ case WM_LBUTTONDOWN:
+ case WM_MBUTTONDOWN:
+ case WM_RBUTTONDOWN:
+ if (obj->eventLogging)
+ pluginLog(instance, "mouseDown at (%d, %d)", LOWORD(event->lParam), HIWORD(event->lParam));
+ if (obj->evaluateScriptOnMouseDownOrKeyDown && obj->mouseDownForEvaluateScript)
+ executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
+ return 1;
+ case WM_LBUTTONUP:
+ case WM_MBUTTONUP:
+ case WM_RBUTTONUP:
+ if (obj->eventLogging)
+ pluginLog(instance, "mouseUp at (%d, %d)", LOWORD(event->lParam), HIWORD(event->lParam));
+ return 1;
+ case WM_SETFOCUS:
+ if (obj->eventLogging)
+ pluginLog(instance, "getFocusEvent");
+ return 1;
+ case WM_KILLFOCUS:
+ if (obj->eventLogging)
+ pluginLog(instance, "loseFocusEvent");
+ return 1;
}
return 0;
}
