Changeset 121550 in webkit


Ignore:
Timestamp:
Jun 29, 2012 5:05:29 AM (12 years ago)
Author:
kbalazs@webkit.org
Message:

[Qt][WTR] Get rid of using DumpRenderTreeSupportQt
https://bugs.webkit.org/show_bug.cgi?id=90262

Reviewed by Alexey Proskuryakov.

Now that we decided to not support v8 in WebKit2
we can get rid of using DumpRenderTreeSupportQt
in WebKitTestRunner.

  • Tools.pro:
  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::resetAfterTest):
(WTR::InjectedBundlePage::didClearWindowForFrame):

  • WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r121545 r121550  
     12012-06-29  Balazs Kelemen  <kbalazs@webkit.org>
     2
     3        [Qt][WTR] Get rid of using DumpRenderTreeSupportQt
     4        https://bugs.webkit.org/show_bug.cgi?id=90262
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Now that we decided to not support v8 in WebKit2
     9        we can get rid of using DumpRenderTreeSupportQt
     10        in WebKitTestRunner.
     11
     12        * Tools.pro:
     13        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     14        (WTR::InjectedBundlePage::resetAfterTest):
     15        (WTR::InjectedBundlePage::didClearWindowForFrame):
     16        * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
     17
    1182012-06-29  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    219
  • trunk/Tools/Tools.pro

    r121228 r121550  
    1818!no_webkit2 {
    1919    SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
    20     # WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
    21     !no_webkit1: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
     20    SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
    2221}
    2322
  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r119127 r121550  
    4545#include <wtf/text/CString.h>
    4646#include <wtf/text/StringBuilder.h>
    47 
    48 #if PLATFORM(QT)
    49 #include "DumpRenderTreeSupportQt.h"
    50 #endif
    5147
    5248using namespace std;
     
    352348    WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
    353349    JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
    354 #if PLATFORM(QT)
    355     DumpRenderTreeSupportQt::injectInternalsObject(context);
    356 #else
    357350    WebCoreTestSupport::resetInternalsObject(context);
    358 #endif
    359351}
    360352
     
    778770    InjectedBundle::shared().accessibilityController()->makeWindowObject(context, window, &exception);
    779771
    780 #if PLATFORM(QT)
    781     DumpRenderTreeSupportQt::injectInternalsObject(context);
    782 #else
    783772    WebCoreTestSupport::injectInternalsObject(context);
    784 #endif
    785773}
    786774
  • trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp

    r108790 r121550  
    3030#include "config.h"
    3131#include "ActivateFonts.h"
    32 #include "DumpRenderTreeSupportQt.h"
    3332#include "QtInitializeTestFonts.h"
    3433
Note: See TracChangeset for help on using the changeset viewer.