Changeset 121550 in webkit
- Timestamp:
- Jun 29, 2012 5:05:29 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r121545 r121550 1 2012-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 1 18 2012-06-29 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 19 -
trunk/Tools/Tools.pro
r121228 r121550 18 18 !no_webkit2 { 19 19 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 22 21 } 23 22 -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
r119127 r121550 45 45 #include <wtf/text/CString.h> 46 46 #include <wtf/text/StringBuilder.h> 47 48 #if PLATFORM(QT)49 #include "DumpRenderTreeSupportQt.h"50 #endif51 47 52 48 using namespace std; … … 352 348 WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page); 353 349 JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame); 354 #if PLATFORM(QT)355 DumpRenderTreeSupportQt::injectInternalsObject(context);356 #else357 350 WebCoreTestSupport::resetInternalsObject(context); 358 #endif359 351 } 360 352 … … 778 770 InjectedBundle::shared().accessibilityController()->makeWindowObject(context, window, &exception); 779 771 780 #if PLATFORM(QT)781 DumpRenderTreeSupportQt::injectInternalsObject(context);782 #else783 772 WebCoreTestSupport::injectInternalsObject(context); 784 #endif785 773 } 786 774 -
trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
r108790 r121550 30 30 #include "config.h" 31 31 #include "ActivateFonts.h" 32 #include "DumpRenderTreeSupportQt.h"33 32 #include "QtInitializeTestFonts.h" 34 33
Note: See TracChangeset
for help on using the changeset viewer.