Changeset 66408 in webkit

Timestamp:

Aug 30, 2010 2:16:45 PM (14 years ago)

Author:

robert@webkit.org

Message:

2010-08-30 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

allow ports with windowed plugins to support windowless plugin tests

​https://bugs.webkit.org/show_bug.cgi?id=40730

Ports that implement plugins windowed by default need to have a way of
supporting plugin tests that assume the plugin is windowless. Add this
feature to the tests and support it in the webkit test plugin. Also
add mouse and keyboard event logging to the webkit-test plugin on Unix.

Unskip the following tests on Qt:

plugins/mouse-events.html
plugins/keyboard-events.html
plugins/mouse-events-fixedpos.html

• platform/qt/Skipped:
• plugins/keyboard-events.html:
• plugins/mouse-events-fixedpos.html:
• plugins/mouse-events.html:

2010-08-30 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

allow ports with windowed plugins to support windowless plugin tests

​https://bugs.webkit.org/show_bug.cgi?id=40730

Ports that implement plugins windowed by default need to have a way of
supporting plugin tests that assume the plugin is windowless. Add this
feature to the tests and support it in the webkit test plugin. Also
add mouse and keyboard event logging to the webkit-test plugin on Unix.

Unskip the following tests on Qt:

plugins/mouse-events.html
plugins/keyboard-events.html
plugins/mouse-events-fixedpos.html

• plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::setFocus): (WebCore::setXKeyEventSpecificFields):

2010-08-30 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

allow ports with windowed plugins to support windowless plugin tests

​https://bugs.webkit.org/show_bug.cgi?id=40730

Ports that implement plugins windowed by default need to have a way of
supporting plugin tests that assume the plugin is windowless. Add this
feature to the tests and support it in the webkit test plugin. Also
add mouse and keyboard event logging to the webkit-test plugin on Unix.

Unskip the following tests on Qt:

plugins/mouse-events.html
plugins/keyboard-events.html
plugins/mouse-events-fixedpos.html

• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp: (pluginSetProperty):
• DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp: (NPP_New):
• DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: (webkit_test_plugin_handle_event):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/plugins/keyboard-events.html (modified) (1 diff)
• LayoutTests/plugins/mouse-events-fixedpos.html (modified) (1 diff)
• LayoutTests/plugins/mouse-events.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/qt/PluginViewQt.cpp (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp (modified) (3 diffs)
• WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-30  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        allow ports with windowed plugins to support windowless plugin tests
+
+        https://bugs.webkit.org/show_bug.cgi?id=40730
+
+        Ports that implement plugins windowed by default need to have a way of
+        supporting plugin tests that assume the plugin is windowless. Add this
+        feature to the tests and support it in the webkit test plugin. Also
+        add mouse and keyboard event logging to the webkit-test plugin on Unix.
+
+        Unskip the following tests on Qt:
+
+        plugins/mouse-events.html
+        plugins/keyboard-events.html
+        plugins/mouse-events-fixedpos.html
+
+        * platform/qt/Skipped:
+        * plugins/keyboard-events.html:
+        * plugins/mouse-events-fixedpos.html:
+        * plugins/mouse-events.html:
+
 2010-08-30  Evan Martin  <evan@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -425 +425 @@
 plugins/embed-attributes-setting.html
 fast/dom/object-embed-plugin-scripting.html
-
-# ---- events not getting to plugin
-# ---- https://bugs.webkit.org/show_bug.cgi?id=40730
-plugins/mouse-events.html
-plugins/keyboard-events.html
-plugins/mouse-events-fixedpos.html
 # ---- to be reviewed
 http/tests/plugins/plugin-document-has-focus.html

trunk/LayoutTests/plugins/keyboard-events.html

@@ -5 +5 @@
 <script>
 
+    plg.windowedPlugin = false;
     plg.eventLoggingEnabled = true;
 

trunk/LayoutTests/plugins/mouse-events-fixedpos.html

@@ -32 +32 @@
     layoutTestController.dumpAsText();
 
+    plg.windowedPlugin = false;
     plg.eventLoggingEnabled = true;
 

trunk/LayoutTests/plugins/mouse-events.html

@@ -6 +6 @@
 <script>
 
+    plg.windowedPlugin = false;
     plg.eventLoggingEnabled = true;
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-30  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        allow ports with windowed plugins to support windowless plugin tests
+
+        https://bugs.webkit.org/show_bug.cgi?id=40730
+
+        Ports that implement plugins windowed by default need to have a way of
+        supporting plugin tests that assume the plugin is windowless. Add this
+        feature to the tests and support it in the webkit test plugin. Also
+        add mouse and keyboard event logging to the webkit-test plugin on Unix.
+
+        Unskip the following tests on Qt:
+
+        plugins/mouse-events.html
+        plugins/keyboard-events.html
+        plugins/mouse-events-fixedpos.html
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::setFocus):
+        (WebCore::setXKeyEventSpecificFields):
+
 2010-08-30  Kinuko Yasuda  <kinuko@chromium.org>
 

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -155 +155 @@
         Widget::setFocus(focused);
     }
+    if (!m_isWindowed) {
+      XEvent npEvent;
+      initXEvent(&npEvent);
+      npEvent.type = (focused) ? 9 : 10; // ints as Qt unsets FocusIn and FocusOut
+      if (!dispatchNPEvent(npEvent))
+          LOG(Events, "PluginView::setFocus(%d): Focus event not accepted", focused);
+    }
 }
 
@@ -375 +382 @@
     xEvent->xkey.state = qKeyEvent->nativeModifiers();
     xEvent->xkey.keycode = qKeyEvent->nativeScanCode();
+
+    // We may not have a nativeScanCode() if the key event is from DRT's eventsender. In that
+    // case just populate the XEvent's keycode with the Qt platform-independent keycode. The only
+    // place this keycode will be used is in webkit_test_plugin_handle_event().
+    if (QWebPagePrivate::drtRun && !xEvent->xkey.keycode) {
+        if (!qKeyEvent->text().isEmpty())
+            xEvent->xkey.keycode = int(qKeyEvent->text().at(0).unicode() + qKeyEvent->modifiers());
+        else if (qKeyEvent->key() && (qKeyEvent->key() != Qt::Key_unknown))
+            xEvent->xkey.keycode = int(qKeyEvent->key() + qKeyEvent->modifiers());
+    }
+
     xEvent->xkey.same_screen = true;
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-30  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        allow ports with windowed plugins to support windowless plugin tests
+
+        https://bugs.webkit.org/show_bug.cgi?id=40730
+
+        Ports that implement plugins windowed by default need to have a way of
+        supporting plugin tests that assume the plugin is windowless. Add this
+        feature to the tests and support it in the webkit test plugin. Also
+        add mouse and keyboard event logging to the webkit-test plugin on Unix.
+
+        Unskip the following tests on Qt:
+
+        plugins/mouse-events.html
+        plugins/keyboard-events.html
+        plugins/mouse-events-fixedpos.html
+
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp:
+        (pluginSetProperty):
+        * DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp:
+        (NPP_New):
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_handle_event):
+
 2010-08-30  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp

@@ -140 +140 @@
     ID_PROPERTY_THROW_EXCEPTION_PROPERTY,
     ID_LAST_SET_WINDOW_ARGUMENTS,
+    ID_PROPERTY_WINDOWED_PLUGIN,
     NUM_PROPERTY_IDENTIFIERS
 };
@@ -155 +156 @@
     "cachedPrivateBrowsingEnabled",
     "testThrowExceptionProperty",
-    "lastSetWindowArguments"
+    "lastSetWindowArguments",
+    "windowedPlugin"
 };
 
@@ -328 +330 @@
     } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_THROW_EXCEPTION_PROPERTY]) {
         browser->setexception(obj, "plugin object testThrowExceptionProperty SUCCESS");
+        return true;
+    } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_WINDOWED_PLUGIN]) {
+        browser->setvalue(plugin->npp, NPPVpluginWindowBool, (void *)NPVARIANT_TO_BOOLEAN(*variant));
         return true;
     }

trunk/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp

@@ -268 +268 @@
 
     XEvent* evt = static_cast<XEvent*>(event);
-    pluginLog(instance, "event %d", evt->type);
+
+    switch (evt->type) {
+        case ButtonRelease:
+            pluginLog(instance, "mouseUp at (%d, %d)", evt->xbutton.x, evt->xbutton.y);
+            break;
+        case ButtonPress:
+            pluginLog(instance, "mouseDown at (%d, %d)", evt->xbutton.x, evt->xbutton.y);
+            break;
+        case KeyRelease:
+            pluginLog(instance, "keyUp '%c'", evt->xkey.keycode);
+            break;
+        case KeyPress:
+            pluginLog(instance, "keyDown '%c'", evt->xkey.keycode);
+            break;
+        case MotionNotify:
+        case EnterNotify:
+        case LeaveNotify:
+            break;
+        case FocusIn:
+            pluginLog(instance, "getFocusEvent");
+            break;
+        case FocusOut:
+            pluginLog(instance, "loseFocusEvent");
+            break;
+        default:
+            pluginLog(instance, "event %d", evt->type);
+    }
 
     return 0;