Changeset 56096 in webkit

Timestamp:

Mar 16, 2010 5:31:41 PM (14 years ago)

Author:

jam@chromium.org

Message:

2010-03-16 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Darin Fisher.

Give keyboard focus to PluginDocuments by default
​https://bugs.webkit.org/show_bug.cgi?id=36147

Test: http/tests/plugins/plugin-document-has-focus.html

• loader/PluginDocument.cpp: (WebCore::PluginDocument::pluginNode):
• loader/PluginDocument.h:
• page/EventHandler.cpp: (WebCore::eventTargetNodeForDocument):

2010-03-16 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Darin Fisher.

Give keyboard focus to PluginDocuments by default
​https://bugs.webkit.org/show_bug.cgi?id=36147

• http/tests/plugins/plugin-document-has-focus-expected.txt: Added.
• http/tests/plugins/plugin-document-has-focus.html: Added.
• http/tests/plugins/resources/plugin-document-has-focus.pl: Added.
• platform/gtk/Skipped:
• platform/mac/Skipped:
• platform/qt/Skipped:
• platform/win/Skipped:

2010-03-16 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Darin Fisher.

Give keyboard focus to PluginDocuments by default
​https://bugs.webkit.org/show_bug.cgi?id=36147

• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp: (pluginAllocate):
• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h:
• DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp: (NPP_New): (NPP_SetWindow): (handleEventCarbon): (handleEventCocoa):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/plugins/plugin-document-has-focus-expected.txt (added)
• LayoutTests/http/tests/plugins/plugin-document-has-focus.html (added)
• LayoutTests/http/tests/plugins/resources/plugin-document-has-focus.pl (added)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/PluginDocument.cpp (modified) (1 diff)
• WebCore/loader/PluginDocument.h (modified) (2 diffs)
• WebCore/page/EventHandler.cpp (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp (modified) (1 diff)
• WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h (modified) (1 diff)
• WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-16  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Give keyboard focus to PluginDocuments by default
+        https://bugs.webkit.org/show_bug.cgi?id=36147
+
+        * http/tests/plugins/plugin-document-has-focus-expected.txt: Added.
+        * http/tests/plugins/plugin-document-has-focus.html: Added.
+        * http/tests/plugins/resources/plugin-document-has-focus.pl: Added.
+        * platform/gtk/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2010-03-16  Chris Fleizach  <cfleizach@apple.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -3586 +3586 @@
 plugins/mouse-events-fixedpos.html
 plugins/keyboard-events.html
+plugins/plugin-document-has-focus.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=30561

trunk/LayoutTests/platform/mac/Skipped

@@ -145 +145 @@
 fast/canvas/webgl/triangle.html
 fast/canvas/webgl/viewport-unchanged-upon-resize.html
+
+# eventSender needs to propagate the event to the calling window, not the main frame always.
+plugins/plugin-document-has-focus.html

trunk/LayoutTests/platform/qt/Skipped

@@ -537 +537 @@
 plugins/open-and-close-window-with-plugin.html
 plugins/keyboard-events.html
+plugins/plugin-document-has-focus.html
 
 security/block-test.html

trunk/LayoutTests/platform/win/Skipped

@@ -784 +784 @@
 # Needs to implement NPP_HandleEvent() in TestNetscapePlugin
 plugins/keyboard-events.html
+plugins/plugin-document-has-focus.html
 
 # DumpRenderTree code to enable Java is currently a no-op. Windows doesn't come with Java by default.

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-16  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Give keyboard focus to PluginDocuments by default
+        https://bugs.webkit.org/show_bug.cgi?id=36147
+
+        Test: http/tests/plugins/plugin-document-has-focus.html
+
+        * loader/PluginDocument.cpp:
+        (WebCore::PluginDocument::pluginNode):
+        * loader/PluginDocument.h:
+        * page/EventHandler.cpp:
+        (WebCore::eventTargetNodeForDocument):
+
 2010-03-16  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/loader/PluginDocument.cpp

@@ -169 +169 @@
 }
 
+Node* PluginDocument::pluginNode()
+{
+    RefPtr<Element> body_element = body();
+    if (body_element)
+        return body_element->firstChild();
+
+    return 0;
 }
+
+}

trunk/WebCore/loader/PluginDocument.h

@@ -30 +30 @@
 namespace WebCore {
 
+class Node;
 class Widget;
 class PluginDocument : public HTMLDocument {
@@ -39 +40 @@
 
     Widget* pluginWidget();
+    Node* pluginNode();
 
 private:

trunk/WebCore/page/EventHandler.cpp

@@ -58 +58 @@
 #include "PlatformKeyboardEvent.h"
 #include "PlatformWheelEvent.h"
+#include "PluginDocument.h"
 #include "RenderFrameSet.h"
 #include "RenderTextControlSingleLine.h"
@@ -2058 +2059 @@
         return 0;
     Node* node = doc->focusedNode();
+    if (!node && doc->isPluginDocument()) {
+        PluginDocument* pluginDocument = static_cast<PluginDocument*>(doc);
+        node =  pluginDocument->pluginNode();
+    }
     if (!node && doc->isHTMLDocument())
         node = doc->body();

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-16  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Give keyboard focus to PluginDocuments by default
+        https://bugs.webkit.org/show_bug.cgi?id=36147
+
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp:
+        (pluginAllocate):
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h:
+        * DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp:
+        (NPP_New):
+        (NPP_SetWindow):
+        (handleEventCarbon):
+        (handleEventCocoa):
+
 2010-03-16  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp

@@ -953 +953 @@
     newInstance->testDocumentOpenInDestroyStream = FALSE;
     newInstance->testWindowOpen = FALSE;
+    newInstance->testKeyboardFocusForPlugins = FALSE;
 
     return (NPObject*)newInstance;

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h

@@ -42 +42 @@
     NPBool testDocumentOpenInDestroyStream;
     NPBool testWindowOpen;
+    NPBool testKeyboardFocusForPlugins;
     char* onStreamLoad;
     char* onStreamDestroy;

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp

@@ -112 +112 @@
         else if (strcasecmp(argn[i], "testwindowopen") == 0)
             obj->testWindowOpen = TRUE;
+        else if (strcasecmp(argn[i], "src") == 0 && strstr(argv[i], "plugin-document-has-focus.pl"))
+            obj->testKeyboardFocusForPlugins = TRUE;
     }
         
@@ -179 +181 @@
         if (obj->logSetWindow) {
             pluginLog(instance, "NPP_SetWindow: %d %d", (int)window->width, (int)window->height);
-            obj->logSetWindow = false;
+            obj->logSetWindow = FALSE;
         }
 
@@ -186 +188 @@
             obj->testWindowOpen = FALSE;
         }
+
+        if (obj->testKeyboardFocusForPlugins) {
+            obj->eventLogging = true;
+            executeScript(obj, "eventSender.keyDown('A');");
+        }
     }
     
@@ -278 +285 @@
         case keyUp:
             pluginLog(instance, "keyUp '%c'", (char)(event->message & 0xFF));
+            if (obj->testKeyboardFocusForPlugins) {
+                obj->eventLogging = false;
+                obj->testKeyboardFocusForPlugins = FALSE;
+                executeScript(obj, "layoutTestController.notifyDone();");
+            }
             break;
         case autoKey:
@@ -346 +358 @@
 
         case NPCocoaEventKeyUp:
-            if (event->data.key.characters)
+            if (event->data.key.characters) {
                 pluginLog(instance, "keyUp '%c'", CFStringGetCharacterAtIndex(reinterpret_cast<CFStringRef>(event->data.key.characters), 0));
+                if (obj->testKeyboardFocusForPlugins) {
+                    obj->eventLogging = false;
+                    obj->testKeyboardFocusForPlugins = FALSE;
+                    executeScript(obj, "layoutTestController.notifyDone();");
+                }
+            }
             return 1;