Changeset 86505 in webkit
- Timestamp:
- May 15, 2011 7:07:35 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r86504 r86505 1 2011-05-15 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r86504. 4 http://trac.webkit.org/changeset/86504 5 https://bugs.webkit.org/show_bug.cgi?id=60853 6 7 "Broke Qt EventSender in editing/selection tests" (Requested 8 by mwenge on #webkit). 9 10 * platform/qt/Skipped: 11 * platform/qt/http/tests/plugins/plugin-document-has-focus-expected.txt: Removed. 12 1 13 2011-05-12 Robert Hogan <robert@webkit.org> 2 14 -
trunk/LayoutTests/platform/qt/Skipped
r86504 r86505 358 358 plugins/embed-attributes-setting.html 359 359 plugins/plugin-initiate-popup-window.html 360 # ---- to be reviewed 361 http/tests/plugins/plugin-document-has-focus.html 360 362 361 363 # Crashes on the buildbot. -
trunk/Source/WebKit/qt/ChangeLog
r86504 r86505 1 2011-05-15 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r86504. 4 http://trac.webkit.org/changeset/86504 5 https://bugs.webkit.org/show_bug.cgi?id=60853 6 7 "Broke Qt EventSender in editing/selection tests" (Requested 8 by mwenge on #webkit). 9 10 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 11 * WebCoreSupport/DumpRenderTreeSupportQt.h: 12 1 13 2011-05-12 Robert Hogan <robert@webkit.org> 2 14 -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r86504 r86505 1143 1143 } 1144 1144 1145 void DumpRenderTreeSupportQt::setView(QWebPage* page, QWidget* view)1146 {1147 if (page->view() == view)1148 return;1149 1150 page->d->view = view;1151 page->setViewportSize(view ? view->size() : QSize(0, 0));1152 }1153 1154 1145 // Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release 1155 1146 -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
r86504 r86505 108 108 static void setMediaType(QWebFrame* qframe, const QString& type); 109 109 static void setDumpRenderTreeModeEnabled(bool b); 110 static void setView(QWebPage*, QWidget* view);111 110 112 111 static void garbageCollectorCollect(); -
trunk/Tools/ChangeLog
r86504 r86505 1 2011-05-15 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r86504. 4 http://trac.webkit.org/changeset/86504 5 https://bugs.webkit.org/show_bug.cgi?id=60853 6 7 "Broke Qt EventSender in editing/selection tests" (Requested 8 by mwenge on #webkit). 9 10 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: 11 (WebCore::WebPage::WebPage): 12 (WebCore::DumpRenderTree::DumpRenderTree): 13 (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting): 14 (WebCore::DumpRenderTree::initJSObjects): 15 * DumpRenderTree/qt/DumpRenderTreeQt.h: 16 (WebCore::DumpRenderTree::eventSender): 17 * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: 18 (webkit_test_plugin_new_instance): 19 (webkit_test_plugin_set_window): 20 (webkit_test_plugin_handle_event): 21 1 22 2011-05-12 Robert Hogan <robert@webkit.org> 2 23 -
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r86504 r86505 160 160 setNetworkAccessManager(m_drt->networkAccessManager()); 161 161 setPluginFactory(new TestPlugin(this)); 162 // Use a minimal, private version of QWebPage::setView() that does not set163 // a PageClient widget. We do this so that EventSender can install event filters164 // on the page without displaying it.165 DumpRenderTreeSupportQt::setView(this, new QWidget(qobject_cast<QWidget*>(parent)));166 m_eventSender.reset(new EventSender(this));167 162 168 163 connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature))); … … 470 465 471 466 connect(m_controller, SIGNAL(done()), this, SLOT(dump())); 467 m_eventSender = new EventSender(m_page); 472 468 m_textInputController = new TextInputController(m_page); 473 469 m_plainTextController = new PlainTextController(m_page); … … 555 551 556 552 // reset mouse clicks counter 557 m_ page->eventSender()->resetClickCount();553 m_eventSender->resetClickCount(); 558 554 559 555 closeRemainingWindows(); … … 780 776 Q_ASSERT(frame); 781 777 frame->addToJavaScriptWindowObject(QLatin1String("layoutTestController"), m_controller); 782 frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), qobject_cast<WebPage*>(frame->page())->eventSender());778 frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), m_eventSender); 783 779 frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController); 784 780 frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController); -
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
r86504 r86505 90 90 91 91 LayoutTestController *layoutTestController() const { return m_controller; } 92 EventSender *eventSender() const { return m_eventSender; } 92 93 TextInputController *textInputController() const { return m_textInputController; } 93 94 QString persistentStoragePath() const { return m_persistentStoragePath; } … … 150 151 QWidget* m_mainView; 151 152 153 EventSender *m_eventSender; 152 154 TextInputController *m_textInputController; 153 155 GCController* m_gcController; … … 183 185 virtual ~WebPage(); 184 186 QWebInspector* webInspector(); 185 EventSender* eventSender() { return m_eventSender.data(); }186 187 void closeWebInspector(); 187 188 … … 216 217 private: 217 218 QWebInspector* m_webInspector; 218 QScopedPointer<EventSender> m_eventSender;219 219 QList<QWebFrame*> m_pendingGeolocationRequests; 220 220 DumpRenderTree *m_drt; -
trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
r86504 r86505 99 99 else if (strcasecmp(argn[i], "onSetWindow") == 0 && !obj->onSetWindow) 100 100 obj->onSetWindow = strdup(argv[i]); 101 else if (!strcasecmp(argn[i], "src") && strstr(argv[i], "plugin-document-has-focus.pl")) {102 browser->setvalue(instance, NPPVpluginWindowBool, false);103 obj->testKeyboardFocusForPlugins = TRUE;104 }105 101 } 106 102 … … 168 164 } 169 165 170 if (obj->testKeyboardFocusForPlugins) {171 obj->eventLogging = true;172 browser->setvalue(instance, NPPVpluginWindowBool, false);173 executeScript(obj, "eventSender.keyDown('A');");174 }175 166 } 176 167 … … 302 293 case KeyRelease: 303 294 pluginLog(instance, "keyUp '%c'", keyEventToChar(&evt->xkey)); 304 if (obj->testKeyboardFocusForPlugins) {305 obj->eventLogging = false;306 obj->testKeyboardFocusForPlugins = FALSE;307 executeScript(obj, "layoutTestController.notifyDone();");308 }309 295 break; 310 296 case KeyPress:
Note: See TracChangeset
for help on using the changeset viewer.