Source/WebCore/ChangeLog

 12012-07-25 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 NOBODY (OOPS!).
 7
 8 Make WebCoreTestSupport helpers exported with WEBCORE_TESTING, otherwise
 9 platforms using source level exporting could not use them in WTR/DRT.
 10
 11 No behavioral change, no new tests.
 12
 13 * testing/js/WebCoreTestSupport.h:
 14 (WebCoreTestSupport):
 15
1162012-07-25 Pavel Feldman <pfeldman@chromium.org>
217
318 https://bugs.webkit.org/show_bug.cgi?id=91931

Source/WebCore/testing/js/WebCoreTestSupport.h

2626#ifndef WebCoreTestSupport_h
2727#define WebCoreTestSupport_h
2828
 29#include "PlatformExportMacros.h"
 30
2931typedef const struct OpaqueJSContext* JSContextRef;
3032
3133namespace WebCoreTestSupport {
3234
33 void injectInternalsObject(JSContextRef);
34 void resetInternalsObject(JSContextRef);
 35WEBCORE_TESTING void injectInternalsObject(JSContextRef);
 36WEBCORE_TESTING void resetInternalsObject(JSContextRef);
3537
3638} // namespace WebCore
3739

Tools/ChangeLog

 12012-07-25 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 NOBODY (OOPS!).
 7
 8 Use WebCoreTestSupport instead of DumpRenderTreeSupportQt like other ports.
 9
 10 * Tools.pro:
 11 * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
 12 (WTR::InjectedBundlePage::resetAfterTest):
 13 (WTR::InjectedBundlePage::didClearWindowForFrame):
 14
1152012-07-25 Gyuyoung Kim <gyuyoung.kim@samsung.com>
216
317 [EFL] Use eina_stringshare_add instead of strdup.

Tools/Tools.pro

@@CONFIG += ordered
1414}
1515
1616!no_webkit2 {
17  # WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
18  !no_webkit1: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
19 
 17 SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
2018 SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
2119 SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
2220}

Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

4545#include <wtf/text/CString.h>
4646#include <wtf/text/StringBuilder.h>
4747
48 #if PLATFORM(QT)
49 #include "DumpRenderTreeSupportQt.h"
50 #endif
51 
5248#if ENABLE(WEB_INTENTS)
5349#include <WebKit2/WKIntentData.h>
5450#endif

@@void InjectedBundlePage::resetAfterTest()
360356{
361357 WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
362358 JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
363 #if PLATFORM(QT)
364  DumpRenderTreeSupportQt::injectInternalsObject(context);
365 #else
366359 WebCoreTestSupport::resetInternalsObject(context);
367 #endif
368360}
369361
370362// Loader Client Callbacks

@@void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, WKBundle
855847 InjectedBundle::shared().textInputController()->makeWindowObject(context, window, &exception);
856848 InjectedBundle::shared().accessibilityController()->makeWindowObject(context, window, &exception);
857849
858 #if PLATFORM(QT)
859  DumpRenderTreeSupportQt::injectInternalsObject(context);
860 #else
861850 WebCoreTestSupport::injectInternalsObject(context);
862 #endif
863851}
864852
865853void InjectedBundlePage::didCancelClientRedirectForFrame(WKBundleFrameRef frame)