Changeset 86464 in webkit


Ignore:
Timestamp:
May 13, 2011 3:09:19 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

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

Unreviewed, rolling out r86447.
​http://trac.webkit.org/changeset/86447
​https://bugs.webkit.org/show_bug.cgi?id=60809

"Broke some uses of EventSender object on Qt" (Requested by
mwenge on #webkit).

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

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

Unreviewed, rolling out r86447.
​http://trac.webkit.org/changeset/86447
​https://bugs.webkit.org/show_bug.cgi?id=60809

"Broke some uses of EventSender object on Qt" (Requested by
mwenge on #webkit).

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

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

Unreviewed, rolling out r86447.
​http://trac.webkit.org/changeset/86447
​https://bugs.webkit.org/show_bug.cgi?id=60809

"Broke some uses of EventSender object on Qt" (Requested by
mwenge on #webkit).

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::WebPage::WebPage): (WebCore::DumpRenderTree::DumpRenderTree): (WebCore::DumpRenderTree::initJSObjects): (WebCore::DumpRenderTree::createWindow):
  • 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

    r86462 r86464  
     12011-05-13  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r86447.
     4        http://trac.webkit.org/changeset/86447
     5        https://bugs.webkit.org/show_bug.cgi?id=60809
     6
     7        "Broke some uses of EventSender object on Qt" (Requested by
     8        mwenge on #webkit).
     9
     10        * platform/qt/Skipped:
     11        * platform/qt/http/tests/plugins/plugin-document-has-focus-expected.txt: Removed.
     12
    1132011-05-13  Adam Barth  <abarth@webkit.org>
    214

  • trunk/LayoutTests/platform/qt/Skipped

    r86447 r86464  
    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# [Qt] plugins/keyboard-events.html fails after r72717

  • trunk/Source/WebKit/qt/ChangeLog

    r86451 r86464  
     12011-05-13  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r86447.
     4        http://trac.webkit.org/changeset/86447
     5        https://bugs.webkit.org/show_bug.cgi?id=60809
     6
     7        "Broke some uses of EventSender object on Qt" (Requested by
     8        mwenge on #webkit).
     9
     10        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     11        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     12
    1132011-05-13  Sam Weinig  <sam@webkit.org>
    214

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

    r86447 r86464  
    11431143}
    11441144
    1145 void DumpRenderTreeSupportQt::setView(QWebPage* page, QWidget* view)
    1146 {
    1147     page->d->view = view;
    1148 }
    1149 
    11501145// Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
    11511146

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

    r86447 r86464  
    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

    r86447 r86464  
     12011-05-13  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r86447.
     4        http://trac.webkit.org/changeset/86447
     5        https://bugs.webkit.org/show_bug.cgi?id=60809
     6
     7        "Broke some uses of EventSender object on Qt" (Requested by
     8        mwenge on #webkit).
     9
     10        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     11        (WebCore::WebPage::WebPage):
     12        (WebCore::DumpRenderTree::DumpRenderTree):
     13        (WebCore::DumpRenderTree::initJSObjects):
     14        (WebCore::DumpRenderTree::createWindow):
     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-13  Robert Hogan  <robert@webkit.org>
    223

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r86447 r86464  
    137137    : QWebPage(parent)
    138138    , m_webInspector(0)
    139     , m_eventSender(0)
    140139    , m_drt(drt)
    141140{
    … …  
    170169    delete m_webInspector;
    171170}
    172 
    173 EventSender* WebPage::eventSender()
    174 {
    175     if (!m_eventSender)
    176         m_eventSender = new EventSender(this);
    177     return m_eventSender;
    178 }
    179 
    180171
    181172QWebInspector* WebPage::webInspector()
    … …  
    474465
    475466    connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
    476     m_eventSender = m_page->eventSender();
     467    m_eventSender = new EventSender(m_page);
    477468    m_textInputController = new TextInputController(m_page);
    478469    m_plainTextController = new PlainTextController(m_page);
    … …  
    785776    Q_ASSERT(frame);
    786777    frame->addToJavaScriptWindowObject(QLatin1String("layoutTestController"), m_controller);
    787     frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), qobject_cast<WebPage*>(frame->page())->eventSender());
     778    frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), m_eventSender);
    788779    frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController);
    789780    frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController);
    … …  
    11071098    // create a QWebPage we want to return
    11081099    QWebPage* page = static_cast<QWebPage*>(new WebPage(container, this));
    1109     // QWebPage::setView() will display the page, so use a minimal version
    1110     // that is just enough to allow EventSender to interact with the page's view
    1111     DumpRenderTreeSupportQt::setView(page, m_mainView);
    1112 
    11131100    // gets cleaned up in closeRemainingWindows()
    11141101    windows.append(container);

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

    r86447 r86464  
    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; }
    … …  
    184185    virtual ~WebPage();
    185186    QWebInspector* webInspector();
    186     EventSender* eventSender();
    187187    void closeWebInspector();
    188188
    … …  
    217217private:
    218218    QWebInspector* m_webInspector;
    219     EventSender* m_eventSender;
    220219    QList<QWebFrame*> m_pendingGeolocationRequests;
    221220    DumpRenderTree *m_drt;

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

    r86447 r86464  
    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.