Changeset 86505 in webkit


Ignore:
Timestamp:
May 15, 2011 7:07:35 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r86504.
http://trac.webkit.org/changeset/86504
https://bugs.webkit.org/show_bug.cgi?id=60853

"Broke Qt EventSender in editing/selection tests" (Requested
by mwenge on #webkit).

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

2011-05-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r86504.
http://trac.webkit.org/changeset/86504
https://bugs.webkit.org/show_bug.cgi?id=60853

"Broke Qt EventSender in editing/selection tests" (Requested
by mwenge on #webkit).

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp:
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

2011-05-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r86504.
http://trac.webkit.org/changeset/86504
https://bugs.webkit.org/show_bug.cgi?id=60853

"Broke Qt EventSender in editing/selection tests" (Requested
by mwenge on #webkit).

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::WebPage::WebPage): (WebCore::DumpRenderTree::DumpRenderTree): (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting): (WebCore::DumpRenderTree::initJSObjects):
  • DumpRenderTree/qt/DumpRenderTreeQt.h: (WebCore::DumpRenderTree::eventSender):
  • DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: (webkit_test_plugin_new_instance): (webkit_test_plugin_set_window): (webkit_test_plugin_handle_event):
Location:
trunk
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r86504 r86505  
     12011-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
    1132011-05-12  Robert Hogan  <robert@webkit.org>
    214
  • trunk/LayoutTests/platform/qt/Skipped

    r86504 r86505  
    358358plugins/embed-attributes-setting.html
    359359plugins/plugin-initiate-popup-window.html
     360# ---- to be reviewed
     361http/tests/plugins/plugin-document-has-focus.html
    360362
    361363# Crashes on the buildbot.
  • trunk/Source/WebKit/qt/ChangeLog

    r86504 r86505  
     12011-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
    1132011-05-12  Robert Hogan  <robert@webkit.org>
    214
  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r86504 r86505  
    11431143}
    11441144
    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 
    11541145// Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
    11551146
  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r86504 r86505  
    108108    static void setMediaType(QWebFrame* qframe, const QString& type);
    109109    static void setDumpRenderTreeModeEnabled(bool b);
    110     static void setView(QWebPage*, QWidget* view);
    111110
    112111    static void garbageCollectorCollect();
  • trunk/Tools/ChangeLog

    r86504 r86505  
     12011-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
    1222011-05-12  Robert Hogan  <robert@webkit.org>
    223
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r86504 r86505  
    160160    setNetworkAccessManager(m_drt->networkAccessManager());
    161161    setPluginFactory(new TestPlugin(this));
    162     // Use a minimal, private version of QWebPage::setView() that does not set
    163     // a PageClient widget. We do this so that EventSender can install event filters
    164     // on the page without displaying it.
    165     DumpRenderTreeSupportQt::setView(this, new QWidget(qobject_cast<QWidget*>(parent)));
    166     m_eventSender.reset(new EventSender(this));
    167162
    168163    connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
     
    470465
    471466    connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
     467    m_eventSender = new EventSender(m_page);
    472468    m_textInputController = new TextInputController(m_page);
    473469    m_plainTextController = new PlainTextController(m_page);
     
    555551
    556552    // reset mouse clicks counter
    557     m_page->eventSender()->resetClickCount();
     553    m_eventSender->resetClickCount();
    558554
    559555    closeRemainingWindows();
     
    780776    Q_ASSERT(frame);
    781777    frame->addToJavaScriptWindowObject(QLatin1String("layoutTestController"), m_controller);
    782     frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), qobject_cast<WebPage*>(frame->page())->eventSender());
     778    frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), m_eventSender);
    783779    frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController);
    784780    frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController);
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

    r86504 r86505  
    9090
    9191    LayoutTestController *layoutTestController() const { return m_controller; }
     92    EventSender *eventSender() const { return m_eventSender; }
    9293    TextInputController *textInputController() const { return m_textInputController; }
    9394    QString persistentStoragePath() const { return m_persistentStoragePath; }
     
    150151    QWidget* m_mainView;
    151152
     153    EventSender *m_eventSender;
    152154    TextInputController *m_textInputController;
    153155    GCController* m_gcController;
     
    183185    virtual ~WebPage();
    184186    QWebInspector* webInspector();
    185     EventSender* eventSender() { return m_eventSender.data(); }
    186187    void closeWebInspector();
    187188
     
    216217private:
    217218    QWebInspector* m_webInspector;
    218     QScopedPointer<EventSender> m_eventSender;
    219219    QList<QWebFrame*> m_pendingGeolocationRequests;
    220220    DumpRenderTree *m_drt;
  • trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp

    r86504 r86505  
    9999            else if (strcasecmp(argn[i], "onSetWindow") == 0 && !obj->onSetWindow)
    100100                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             }
    105101        }
    106102
     
    168164        }
    169165
    170         if (obj->testKeyboardFocusForPlugins) {
    171             obj->eventLogging = true;
    172             browser->setvalue(instance, NPPVpluginWindowBool, false);
    173             executeScript(obj, "eventSender.keyDown('A');");
    174         }
    175166    }
    176167
     
    302293        case KeyRelease:
    303294            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             }
    309295            break;
    310296        case KeyPress:
Note: See TracChangeset for help on using the changeset viewer.