Changeset 86504 in webkit

Timestamp:

May 15, 2011 6:49:23 AM (13 years ago)

Author:

robert@webkit.org

Message:

2011-05-12 Robert Hogan <​robert@webkit.org>

Reviewed by Benjamin Poulain.

[Qt] fix http/tests/plugins/plugin-document-has-focus.html

For some reason the platform-independent expected result has
no newline at the end of the file. The unix test plugin also
reports the event from a different line. These are harmless
differences, so create platform-specific result.

Note that nearly every platform skips this test at the moment.

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

• platform/qt/Skipped:
• platform/qt/http/tests/plugins/plugin-document-has-focus-expected.txt: Added.

2011-05-12 Robert Hogan <​robert@webkit.org>

Reviewed by Benjamin Poulain.

[Qt] fix http/tests/plugins/plugin-document-has-focus.html
​https://bugs.webkit.org/show_bug.cgi?id=60722

QWebPage::setView() will display the browser window, so
implement a private version that does just enough to
satisfy EventSender's requirement to install an event
filter on a page's web view.

• WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::setView):
• WebCoreSupport/DumpRenderTreeSupportQt.h:

2011-05-12 Robert Hogan <​robert@webkit.org>

Reviewed by Benjamin Poulain.

[Qt] fix http/tests/plugins/plugin-document-has-focus.html

The support for this test added to the unix test plugin here
may allow other platforms to pass it (nearly everyone
skips it). On Qt it required a bit of trickiness with
the page's EventSender object to get it working fully though,
so only unskipping Qt here.

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

• DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::WebPage::WebPage): (WebCore::WebPage::eventSender): (WebCore::DumpRenderTree::DumpRenderTree): (WebCore::DumpRenderTree::initJSObjects): (WebCore::DumpRenderTree::createWindow):
• DumpRenderTree/qt/DumpRenderTreeQt.h:
• DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: (webkit_test_plugin_new_instance): (webkit_test_plugin_set_window): (webkit_test_plugin_handle_event):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/http/tests/plugins/plugin-document-has-focus-expected.txt (added)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (4 diffs)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.h (modified) (4 diffs)
• Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-12  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] fix http/tests/plugins/plugin-document-has-focus.html
+
+        For some reason the platform-independent expected result has
+        no newline at the end of the file. The unix test plugin also
+        reports the event from a different line. These are harmless
+        differences, so create platform-specific result.
+
+        Note that nearly every platform skips this test at the moment.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60722
+
+        * platform/qt/Skipped:
+        * platform/qt/http/tests/plugins/plugin-document-has-focus-expected.txt: Added.
+
 2011-05-14  Abhishek Arya  <inferno@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -358 +358 @@
 plugins/embed-attributes-setting.html
 plugins/plugin-initiate-popup-window.html
-# ---- to be reviewed
-http/tests/plugins/plugin-document-has-focus.html
 
 # Crashes on the buildbot.

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-12  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] fix http/tests/plugins/plugin-document-has-focus.html
+        https://bugs.webkit.org/show_bug.cgi?id=60722
+
+        QWebPage::setView() will display the browser window, so
+        implement a private version that does just enough to 
+        satisfy EventSender's requirement to install an event
+        filter on a page's web view.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::setView):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2011-05-13  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -1143 +1143 @@
 }
 
+void DumpRenderTreeSupportQt::setView(QWebPage* page, QWidget* view)
+{
+    if (page->view() == view)
+        return;
+
+    page->d->view = view;
+    page->setViewportSize(view ? view->size() : QSize(0, 0));
+}
+
 // Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

@@ -108 +108 @@
     static void setMediaType(QWebFrame* qframe, const QString& type);
     static void setDumpRenderTreeModeEnabled(bool b);
+    static void setView(QWebPage*, QWidget* view);
 
     static void garbageCollectorCollect();

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-12  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] fix http/tests/plugins/plugin-document-has-focus.html
+
+        The support for this test added to the unix test plugin here
+        may allow other platforms to pass it (nearly everyone
+        skips it). On Qt it required a bit of trickiness with
+        the page's EventSender object to get it working fully though,
+        so only unskipping Qt here.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60722
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::WebPage):
+        (WebCore::WebPage::eventSender):
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::initJSObjects):
+        (WebCore::DumpRenderTree::createWindow):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_new_instance):
+        (webkit_test_plugin_set_window):
+        (webkit_test_plugin_handle_event):
+
 2011-05-14  Arno Renevier  <arno@renevier.net>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -160 +160 @@
     setNetworkAccessManager(m_drt->networkAccessManager());
     setPluginFactory(new TestPlugin(this));
+    // Use a minimal, private version of QWebPage::setView() that does not set
+    // a PageClient widget. We do this so that EventSender can install event filters
+    // on the page without displaying it.
+    DumpRenderTreeSupportQt::setView(this, new QWidget(qobject_cast<QWidget*>(parent)));
+    m_eventSender.reset(new EventSender(this));
 
     connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
@@ -465 +470 @@
 
     connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
-    m_eventSender = new EventSender(m_page);
     m_textInputController = new TextInputController(m_page);
     m_plainTextController = new PlainTextController(m_page);
@@ -551 +555 @@
 
     // reset mouse clicks counter
-    m_eventSender->resetClickCount();
+    m_page->eventSender()->resetClickCount();
 
     closeRemainingWindows();
@@ -776 +780 @@
     Q_ASSERT(frame);
     frame->addToJavaScriptWindowObject(QLatin1String("layoutTestController"), m_controller);
-    frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), m_eventSender);
+    frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), qobject_cast<WebPage*>(frame->page())->eventSender());
     frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController);
     frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController);

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -90 +90 @@
 
     LayoutTestController *layoutTestController() const { return m_controller; }
-    EventSender *eventSender() const { return m_eventSender; }
     TextInputController *textInputController() const { return m_textInputController; }
     QString persistentStoragePath() const { return m_persistentStoragePath; }
@@ -151 +150 @@
     QWidget* m_mainView;
 
-    EventSender *m_eventSender;
     TextInputController *m_textInputController;
     GCController* m_gcController;
@@ -185 +183 @@
     virtual ~WebPage();
     QWebInspector* webInspector();
+    EventSender* eventSender() { return m_eventSender.data(); }
     void closeWebInspector();
 
@@ -217 +216 @@
 private:
     QWebInspector* m_webInspector;
+    QScopedPointer<EventSender> m_eventSender;
     QList<QWebFrame*> m_pendingGeolocationRequests;
     DumpRenderTree *m_drt;

trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp

@@ -99 +99 @@
             else if (strcasecmp(argn[i], "onSetWindow") == 0 && !obj->onSetWindow)
                 obj->onSetWindow = strdup(argv[i]);
+            else if (!strcasecmp(argn[i], "src") && strstr(argv[i], "plugin-document-has-focus.pl")) {
+                browser->setvalue(instance, NPPVpluginWindowBool, false);
+                obj->testKeyboardFocusForPlugins = TRUE;
+            }
         }
 
@@ -164 +168 @@
         }
 
+        if (obj->testKeyboardFocusForPlugins) {
+            obj->eventLogging = true;
+            browser->setvalue(instance, NPPVpluginWindowBool, false);
+            executeScript(obj, "eventSender.keyDown('A');");
+        }
     }
 
@@ -293 +302 @@
         case KeyRelease:
             pluginLog(instance, "keyUp '%c'", keyEventToChar(&evt->xkey));
+            if (obj->testKeyboardFocusForPlugins) {
+                obj->eventLogging = false;
+                obj->testKeyboardFocusForPlugins = FALSE;
+                executeScript(obj, "layoutTestController.notifyDone();");
+            }
             break;
         case KeyPress: