Skip to content
Browse files

Rename LayoutTestController to TestRunner in WebKitTestRunner

https://bugs.webkit.org/show_bug.cgi?id=93942

Reviewed by Simon Fraser.

Renamed the class and relevant files.

* WebKitTestRunner/CMakeLists.txt:
* WebKitTestRunner/DerivedSources.make:
* WebKitTestRunner/GNUmakefile.am:
* WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: Removed.
* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Copied from Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl.
* WebKitTestRunner/InjectedBundle/DerivedSources.pri:
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::didReceiveMessage):
(WTR::InjectedBundle::beginTesting):
* WebKitTestRunner/InjectedBundle/InjectedBundle.h:
(WTR::InjectedBundle::testRunner):
(InjectedBundle):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: Removed.
* WebKitTestRunner/InjectedBundle/LayoutTestController.h: Removed.
* WebKitTestRunner/InjectedBundle/Target.pri:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp.
* WebKitTestRunner/InjectedBundle/TestRunner.h: Copied from Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h.
(TestRunner):
* WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp: Removed.
* WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp.
(WTR::waitToDumpWatchdogTimerCallback):
(WTR::TestRunner::platformInitialize):
(WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
(WTR::TestRunner::pathToLocalResource):
(WTR::TestRunner::platformName):
* WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp: Removed.
* WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp.
(WTR::waitToDumpWatchdogTimerCallback):
(WTR::TestRunner::platformInitialize):
(WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
(WTR::TestRunner::pathToLocalResource):
(WTR::TestRunner::platformName):
* WebKitTestRunner/InjectedBundle/mac/LayoutTestControllerMac.mm: Removed.
* WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm: Copied from Tools/WebKitTestRunner/InjectedBundle/mac/LayoutTestControllerMac.mm.
(WTR::TestRunner::platformInitialize):
(WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
(WTR::waitUntilDoneWatchdogTimerFired):
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
(WTR::TestRunner::pathToLocalResource):
(WTR::TestRunner::platformName):
* WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp: Removed.
* WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp.
(WTR::WatchdogTimerHelper::timerFired):
(WTR::TestRunner::platformInitialize):
(WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
(WTR::TestRunner::pathToLocalResource):
(WTR::TestRunner::platformName):
* WebKitTestRunner/InjectedBundle/win/LayoutTestControllerWin.cpp: Removed.
* WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/win/LayoutTestControllerWin.cpp.
(WTR::TestRunner::platformInitialize):
(WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
(WTR::waitToDumpWatchdogTimerFired):
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
(WTR::TestRunner::pathToLocalResource):
(WTR::TestRunner::platformName):
* WebKitTestRunner/PlatformEfl.cmake:
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
* WebKitTestRunner/win/InjectedBundle.vcproj:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@125732 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
1 parent e02e1f4 commit 8dad49fd79620fd5be3727b33af04c58c73a64c2 @rniwa rniwa committed
Showing with 315 additions and 243 deletions.
  1. +72 −0 Tools/ChangeLog
  2. +1 −1 Tools/WebKitTestRunner/CMakeLists.txt
  3. +1 −1 Tools/WebKitTestRunner/DerivedSources.make
  4. +4 −4 Tools/WebKitTestRunner/GNUmakefile.am
  5. +1 −1 Tools/WebKitTestRunner/InjectedBundle/Bindings/{LayoutTestController.idl → TestRunner.idl}
  6. +1 −1 Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri
  7. +6 −6 Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
  8. +3 −3 Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
  9. +64 −64 Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
  10. +4 −4 Tools/WebKitTestRunner/InjectedBundle/Target.pri
  11. +90 −90 Tools/WebKitTestRunner/InjectedBundle/{LayoutTestController.cpp → TestRunner.cpp}
  12. +7 −7 Tools/WebKitTestRunner/InjectedBundle/{LayoutTestController.h → TestRunner.h}
  13. +7 −7 Tools/WebKitTestRunner/InjectedBundle/efl/{LayoutTestControllerEfl.cpp → TestRunnerEfl.cpp}
  14. +7 −7 Tools/WebKitTestRunner/InjectedBundle/gtk/{LayoutTestControllerGtk.cpp → TestRunnerGtk.cpp}
  15. +7 −7 Tools/WebKitTestRunner/InjectedBundle/mac/{LayoutTestControllerMac.mm → TestRunnerMac.mm}
  16. +8 −8 Tools/WebKitTestRunner/InjectedBundle/qt/{LayoutTestControllerQt.cpp → TestRunnerQt.cpp}
  17. +7 −7 Tools/WebKitTestRunner/InjectedBundle/win/{LayoutTestControllerWin.cpp → TestRunnerWin.cpp}
  18. +1 −1 Tools/WebKitTestRunner/PlatformEfl.cmake
  19. +18 −18 Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
  20. +6 −6 Tools/WebKitTestRunner/win/InjectedBundle.vcproj
View
72 Tools/ChangeLog
@@ -1,3 +1,75 @@
+2012-08-15 Ryosuke Niwa <rniwa@webkit.org>
+
+ Rename LayoutTestController to TestRunner in WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=93942
+
+ Reviewed by Simon Fraser.
+
+ Renamed the class and relevant files.
+
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/DerivedSources.make:
+ * WebKitTestRunner/GNUmakefile.am:
+ * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: Removed.
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Copied from Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl.
+ * WebKitTestRunner/InjectedBundle/DerivedSources.pri:
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::didReceiveMessage):
+ (WTR::InjectedBundle::beginTesting):
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+ (WTR::InjectedBundle::testRunner):
+ (InjectedBundle):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.h: Removed.
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp.
+ * WebKitTestRunner/InjectedBundle/TestRunner.h: Copied from Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h.
+ (TestRunner):
+ * WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp.
+ (WTR::waitToDumpWatchdogTimerCallback):
+ (WTR::TestRunner::platformInitialize):
+ (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
+ (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+ (WTR::TestRunner::pathToLocalResource):
+ (WTR::TestRunner::platformName):
+ * WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp.
+ (WTR::waitToDumpWatchdogTimerCallback):
+ (WTR::TestRunner::platformInitialize):
+ (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
+ (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+ (WTR::TestRunner::pathToLocalResource):
+ (WTR::TestRunner::platformName):
+ * WebKitTestRunner/InjectedBundle/mac/LayoutTestControllerMac.mm: Removed.
+ * WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm: Copied from Tools/WebKitTestRunner/InjectedBundle/mac/LayoutTestControllerMac.mm.
+ (WTR::TestRunner::platformInitialize):
+ (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
+ (WTR::waitUntilDoneWatchdogTimerFired):
+ (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+ (WTR::TestRunner::pathToLocalResource):
+ (WTR::TestRunner::platformName):
+ * WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp.
+ (WTR::WatchdogTimerHelper::timerFired):
+ (WTR::TestRunner::platformInitialize):
+ (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
+ (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+ (WTR::TestRunner::pathToLocalResource):
+ (WTR::TestRunner::platformName):
+ * WebKitTestRunner/InjectedBundle/win/LayoutTestControllerWin.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/win/LayoutTestControllerWin.cpp.
+ (WTR::TestRunner::platformInitialize):
+ (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
+ (WTR::waitToDumpWatchdogTimerFired):
+ (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+ (WTR::TestRunner::pathToLocalResource):
+ (WTR::TestRunner::platformName):
+ * WebKitTestRunner/PlatformEfl.cmake:
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+ * WebKitTestRunner/win/InjectedBundle.vcproj:
+
2012-08-15 Xianzhu Wang <wangxianzhu@chromium.org>
[Chromium-Android] DumpRenderTree timeouts before NRWT timeouts
View
2 Tools/WebKitTestRunner/CMakeLists.txt
@@ -55,7 +55,7 @@ SET(WebKitTestRunnerInjectedBundle_SOURCES
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/InjectedBundle.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/InjectedBundleMain.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/InjectedBundlePage.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/LayoutTestController.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/TestRunner.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/TextInputController.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings/JSWrapper.cpp
View
2 Tools/WebKitTestRunner/DerivedSources.make
@@ -32,7 +32,7 @@ INTERFACES = \
AccessibilityUIElement \
EventSendingController \
GCController \
- LayoutTestController \
+ TestRunner \
TextInputController \
#
View
8 Tools/WebKitTestRunner/GNUmakefile.am
@@ -72,7 +72,7 @@ webkittestrunner_built_sources += \
DerivedSources/InjectedBundle/JSAccessibilityUIElement.cpp \
DerivedSources/InjectedBundle/JSEventSendingController.cpp \
DerivedSources/InjectedBundle/JSGCController.cpp \
- DerivedSources/InjectedBundle/JSLayoutTestController.cpp \
+ DerivedSources/InjectedBundle/JSTestRunner.cpp \
DerivedSources/InjectedBundle/JSTextInputController.cpp
nodist_Libraries_libTestRunnerInjectedBundle_la_SOURCES = $(webkittestrunner_built_sources)
BUILT_SOURCES += $(webkittestrunner_built_sources)
@@ -98,14 +98,14 @@ Libraries_libTestRunnerInjectedBundle_la_SOURCES = \
Tools/WebKitTestRunner/InjectedBundle/gtk/AccessibilityUIElementGtk.cpp \
Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp \
Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleGtk.cpp \
- Tools/WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp \
+ Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp \
Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp \
Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h \
Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp \
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp \
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h \
- Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp \
- Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h \
+ Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp \
+ Tools/WebKitTestRunner/InjectedBundle/TestRunner.h \
Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp \
Tools/WebKitTestRunner/InjectedBundle/TextInputController.h
View
2 ...dBundle/Bindings/LayoutTestController.idl → ...er/InjectedBundle/Bindings/TestRunner.idl
@@ -25,7 +25,7 @@
module WTR {
- interface LayoutTestController {
+ interface TestRunner {
// The basics.
void dumpAsText(in boolean dumpPixels);
void dumpChildFramesAsText();
View
2 Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri
@@ -18,7 +18,7 @@ IDL_BINDINGS += \
Bindings/AccessibilityUIElement.idl \
Bindings/EventSendingController.idl \
Bindings/GCController.idl \
- Bindings/LayoutTestController.idl \
+ Bindings/TestRunner.idl \
Bindings/TextInputController.idl \
# GENERATOR 1: IDL compiler
View
12 Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -169,19 +169,19 @@ void InjectedBundle::didReceiveMessage(WKStringRef messageName, WKTypeRef messag
return;
}
if (WKStringIsEqualToUTF8CString(messageName, "CallAddChromeInputFieldCallback")) {
- m_layoutTestController->callAddChromeInputFieldCallback();
+ m_testRunner->callAddChromeInputFieldCallback();
return;
}
if (WKStringIsEqualToUTF8CString(messageName, "CallRemoveChromeInputFieldCallback")) {
- m_layoutTestController->callRemoveChromeInputFieldCallback();
+ m_testRunner->callRemoveChromeInputFieldCallback();
return;
}
if (WKStringIsEqualToUTF8CString(messageName, "CallFocusWebViewCallback")) {
- m_layoutTestController->callFocusWebViewCallback();
+ m_testRunner->callFocusWebViewCallback();
return;
}
if (WKStringIsEqualToUTF8CString(messageName, "CallSetBackingScaleFactorCallback")) {
- m_layoutTestController->callSetBackingScaleFactorCallback();
+ m_testRunner->callSetBackingScaleFactorCallback();
return;
}
@@ -211,7 +211,7 @@ void InjectedBundle::beginTesting(WKDictionaryRef settings)
m_repaintRects.clear();
m_stringBuilder->clear();
- m_layoutTestController = LayoutTestController::create();
+ m_testRunner = TestRunner::create();
m_gcController = GCController::create();
m_eventSendingController = EventSendingController::create();
m_textInputController = TextInputController::create();
@@ -228,7 +228,7 @@ void InjectedBundle::beginTesting(WKDictionaryRef settings)
WKBundleRemoveAllUserContent(m_bundle, m_pageGroup);
- m_layoutTestController->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
+ m_testRunner->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
page()->prepare();
View
6 Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
@@ -29,7 +29,7 @@
#include "AccessibilityController.h"
#include "EventSendingController.h"
#include "GCController.h"
-#include "LayoutTestController.h"
+#include "TestRunner.h"
#include "TextInputController.h"
#include <WebKit2/WKBase.h>
#include <WebKit2/WKRetainPtr.h>
@@ -57,7 +57,7 @@ class InjectedBundle {
WKBundleRef bundle() const { return m_bundle; }
WKBundlePageGroupRef pageGroup() const { return m_pageGroup; }
- LayoutTestController* layoutTestController() { return m_layoutTestController.get(); }
+ TestRunner* testRunner() { return m_testRunner.get(); }
GCController* gcController() { return m_gcController.get(); }
EventSendingController* eventSendingController() { return m_eventSendingController.get(); }
TextInputController* textInputController() { return m_textInputController.get(); }
@@ -115,7 +115,7 @@ class InjectedBundle {
Vector<OwnPtr<InjectedBundlePage> > m_pages;
RefPtr<AccessibilityController> m_accessibilityController;
- RefPtr<LayoutTestController> m_layoutTestController;
+ RefPtr<TestRunner> m_testRunner;
RefPtr<GCController> m_gcController;
RefPtr<EventSendingController> m_eventSendingController;
RefPtr<TextInputController> m_textInputController;
View
128 Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -711,7 +711,7 @@ void InjectedBundlePage::didStartProvisionalLoadForFrame(WKBundleFrameRef frame)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
dumpFrameDescriptionSuitableForTestResult(frame);
InjectedBundle::shared().stringBuilder()->append(" - didStartProvisionalLoadForFrame\n");
}
@@ -734,7 +734,7 @@ void InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame(WKBundleFrameRe
return;
InjectedBundle::shared().setTopLoadingFrame(0);
- if (InjectedBundle::shared().layoutTestController()->waitToDump())
+ if (InjectedBundle::shared().testRunner()->waitToDump())
return;
InjectedBundle::shared().done();
@@ -745,7 +745,7 @@ void InjectedBundlePage::didCommitLoadForFrame(WKBundleFrameRef frame)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
return;
dumpFrameDescriptionSuitableForTestResult(frame);
@@ -757,7 +757,7 @@ void InjectedBundlePage::didFinishProgress()
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpProgressFinishedCallback())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpProgressFinishedCallback())
return;
InjectedBundle::shared().stringBuilder()->append("postProgressFinishedNotification\n");
@@ -865,7 +865,7 @@ void InjectedBundlePage::dump()
{
ASSERT(InjectedBundle::shared().isTestRunning());
- InjectedBundle::shared().layoutTestController()->invalidateWaitToDumpWatchdogTimer();
+ InjectedBundle::shared().testRunner()->invalidateWaitToDumpWatchdogTimer();
// Force a paint before dumping. This matches DumpRenderTree on Windows. (DumpRenderTree on Mac
// does this at a slightly different time.) See <http://webkit.org/b/55469> for details.
@@ -874,31 +874,31 @@ void InjectedBundlePage::dump()
WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
WTF::String url = toWTFString(adoptWK(WKURLCopyString(adoptWK(WKBundleFrameCopyURL(frame)).get())));
if (url.find("dumpAsText/") != WTF::notFound)
- InjectedBundle::shared().layoutTestController()->dumpAsText(false);
+ InjectedBundle::shared().testRunner()->dumpAsText(false);
- switch (InjectedBundle::shared().layoutTestController()->whatToDump()) {
- case LayoutTestController::RenderTree: {
+ switch (InjectedBundle::shared().testRunner()->whatToDump()) {
+ case TestRunner::RenderTree: {
WKRetainPtr<WKStringRef> text(AdoptWK, WKBundlePageCopyRenderTreeExternalRepresentation(m_page));
InjectedBundle::shared().stringBuilder()->append(toWTFString(text));
break;
}
- case LayoutTestController::MainFrameText:
+ case TestRunner::MainFrameText:
dumpFrameText(WKBundlePageGetMainFrame(m_page));
break;
- case LayoutTestController::AllFramesText:
+ case TestRunner::AllFramesText:
dumpAllFramesText();
break;
}
- if (InjectedBundle::shared().layoutTestController()->shouldDumpAllFrameScrollPositions())
+ if (InjectedBundle::shared().testRunner()->shouldDumpAllFrameScrollPositions())
dumpAllFrameScrollPositions();
- else if (InjectedBundle::shared().layoutTestController()->shouldDumpMainFrameScrollPosition())
+ else if (InjectedBundle::shared().testRunner()->shouldDumpMainFrameScrollPosition())
dumpFrameScrollPosition(WKBundlePageGetMainFrame(m_page));
- if (InjectedBundle::shared().layoutTestController()->shouldDumpBackForwardListsForAllWindows())
+ if (InjectedBundle::shared().testRunner()->shouldDumpBackForwardListsForAllWindows())
InjectedBundle::shared().dumpBackForwardListsForAllPages();
- if (InjectedBundle::shared().shouldDumpPixels() && InjectedBundle::shared().layoutTestController()->shouldDumpPixels()) {
+ if (InjectedBundle::shared().shouldDumpPixels() && InjectedBundle::shared().testRunner()->shouldDumpPixels()) {
InjectedBundle::shared().setPixelResult(adoptWK(WKBundlePageCreateSnapshotWithOptions(m_page, WKBundleFrameGetVisibleContentBounds(WKBundlePageGetMainFrame(m_page)), kWKSnapshotOptionsShareable | kWKSnapshotOptionsInViewCoordinates)).get());
if (WKBundlePageIsTrackingRepaints(m_page))
InjectedBundle::shared().setRepaintRects(adoptWK(WKBundlePageCopyTrackedRepaintRects(m_page)).get());
@@ -912,7 +912,7 @@ void InjectedBundlePage::didFinishLoadForFrame(WKBundleFrameRef frame)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
dumpFrameDescriptionSuitableForTestResult(frame);
InjectedBundle::shared().stringBuilder()->append(" - didFinishLoadForFrame\n");
}
@@ -921,7 +921,7 @@ void InjectedBundlePage::didFinishLoadForFrame(WKBundleFrameRef frame)
return;
InjectedBundle::shared().setTopLoadingFrame(0);
- if (InjectedBundle::shared().layoutTestController()->waitToDump())
+ if (InjectedBundle::shared().testRunner()->waitToDump())
return;
InjectedBundle::shared().page()->dump();
@@ -936,7 +936,7 @@ void InjectedBundlePage::didFailLoadWithErrorForFrame(WKBundleFrameRef frame, WK
return;
InjectedBundle::shared().setTopLoadingFrame(0);
- if (InjectedBundle::shared().layoutTestController()->waitToDump())
+ if (InjectedBundle::shared().testRunner()->waitToDump())
return;
InjectedBundle::shared().done();
@@ -947,14 +947,14 @@ void InjectedBundlePage::didReceiveTitleForFrame(WKStringRef title, WKBundleFram
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
dumpFrameDescriptionSuitableForTestResult(frame);
InjectedBundle::shared().stringBuilder()->append(" - didReceiveTitle: ");
InjectedBundle::shared().stringBuilder()->append(toWTFString(title));
InjectedBundle::shared().stringBuilder()->append("\n");
}
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpTitleChanges())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpTitleChanges())
return;
InjectedBundle::shared().stringBuilder()->append("TITLE CHANGED: ");
@@ -971,12 +971,12 @@ void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, WKBundle
JSObjectRef window = JSContextGetGlobalObject(context);
if (WKBundleScriptWorldNormalWorld() != world) {
- JSObjectSetProperty(context, window, toJS("__worldID").get(), JSValueMakeNumber(context, LayoutTestController::worldIDForWorld(world)), kJSPropertyAttributeReadOnly, 0);
+ JSObjectSetProperty(context, window, toJS("__worldID").get(), JSValueMakeNumber(context, TestRunner::worldIDForWorld(world)), kJSPropertyAttributeReadOnly, 0);
return;
}
JSValueRef exception = 0;
- InjectedBundle::shared().layoutTestController()->makeWindowObject(context, window, &exception);
+ InjectedBundle::shared().testRunner()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().eventSendingController()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().textInputController()->makeWindowObject(context, window, &exception);
@@ -994,7 +994,7 @@ void InjectedBundlePage::didCancelClientRedirectForFrame(WKBundleFrameRef frame)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
return;
dumpFrameDescriptionSuitableForTestResult(frame);
@@ -1006,7 +1006,7 @@ void InjectedBundlePage::willPerformClientRedirectForFrame(WKBundleFrameRef fram
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
return;
dumpFrameDescriptionSuitableForTestResult(frame);
@@ -1024,7 +1024,7 @@ void InjectedBundlePage::didFinishDocumentLoadForFrame(WKBundleFrameRef frame)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
dumpFrameDescriptionSuitableForTestResult(frame);
InjectedBundle::shared().stringBuilder()->append(" - didFinishDocumentLoadForFrame\n");
}
@@ -1043,7 +1043,7 @@ void InjectedBundlePage::didHandleOnloadEventsForFrame(WKBundleFrameRef frame)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
dumpFrameDescriptionSuitableForTestResult(frame);
InjectedBundle::shared().stringBuilder()->append(" - didHandleOnloadEventsForFrame\n");
}
@@ -1066,7 +1066,7 @@ void InjectedBundlePage::didInitiateLoadForResource(WKBundlePageRef, WKBundleFra
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
return;
WKRetainPtr<WKURLRef> url = adoptWK(WKURLRequestCopyURL(request));
@@ -1087,11 +1087,11 @@ static inline bool isHTTPOrHTTPSScheme(WKStringRef scheme)
WKURLRequestRef InjectedBundlePage::willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef frame, uint64_t identifier, WKURLRequestRef request, WKURLResponseRef response)
{
- if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().layoutTestController()->willSendRequestReturnsNull())
+ if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().testRunner()->willSendRequestReturnsNull())
return 0;
if (InjectedBundle::shared().isTestRunning()
- && InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks()) {
+ && InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
InjectedBundle::shared().stringBuilder()->append(assignedUrlsCache.contains(identifier)
? assignedUrlsCache.get(identifier)
: "<unknown>");
@@ -1138,7 +1138,7 @@ void InjectedBundlePage::didReceiveResponseForResource(WKBundlePageRef, WKBundle
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
InjectedBundle::shared().stringBuilder()->append(assignedUrlsCache.contains(identifier)
? assignedUrlsCache.get(identifier)
: "<unknown>");
@@ -1148,7 +1148,7 @@ void InjectedBundlePage::didReceiveResponseForResource(WKBundlePageRef, WKBundle
}
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceResponseMIMETypes())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpResourceResponseMIMETypes())
return;
WKRetainPtr<WKURLRef> url = adoptWK(WKURLResponseCopyURL(response));
@@ -1170,7 +1170,7 @@ void InjectedBundlePage::didFinishLoadForResource(WKBundlePageRef, WKBundleFrame
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
return;
InjectedBundle::shared().stringBuilder()->append(assignedUrlsCache.contains(identifier)
@@ -1184,7 +1184,7 @@ void InjectedBundlePage::didFailLoadForResource(WKBundlePageRef, WKBundleFrameRe
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
return;
InjectedBundle::shared().stringBuilder()->append(assignedUrlsCache.contains(identifier)
@@ -1224,10 +1224,10 @@ WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForNavigationAction(WKB
if (!InjectedBundle::shared().isTestRunning())
return WKBundlePagePolicyActionUse;
- if (!InjectedBundle::shared().layoutTestController()->isPolicyDelegateEnabled())
+ if (!InjectedBundle::shared().testRunner()->isPolicyDelegateEnabled())
return WKBundlePagePolicyActionUse;
- if (InjectedBundle::shared().layoutTestController()->waitToDump()) {
+ if (InjectedBundle::shared().testRunner()->waitToDump()) {
WKRetainPtr<WKStringRef> url = adoptWK(WKURLCopyString(WKURLRequestCopyURL(request)));
InjectedBundle::shared().stringBuilder()->append("Policy delegate: attempt to load ");
InjectedBundle::shared().stringBuilder()->append(toWTFString(url));
@@ -1241,10 +1241,10 @@ WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForNavigationAction(WKB
}
InjectedBundle::shared().stringBuilder()->append("\n");
- InjectedBundle::shared().layoutTestController()->notifyDone();
+ InjectedBundle::shared().testRunner()->notifyDone();
}
- if (InjectedBundle::shared().layoutTestController()->isPolicyDelegatePermissive())
+ if (InjectedBundle::shared().testRunner()->isPolicyDelegatePermissive())
return WKBundlePagePolicyActionUse;
return WKBundlePagePolicyActionPassThrough;
}
@@ -1337,7 +1337,7 @@ void InjectedBundlePage::willSetStatusbarText(WKStringRef statusbarText)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (!InjectedBundle::shared().layoutTestController()->shouldDumpStatusCallbacks())
+ if (!InjectedBundle::shared().testRunner()->shouldDumpStatusCallbacks())
return;
InjectedBundle::shared().stringBuilder()->append("UI DELEGATE STATUS CALLBACK: setStatusText:");
@@ -1436,12 +1436,12 @@ bool InjectedBundlePage::shouldBeginEditing(WKBundleRangeHandleRef range)
if (!InjectedBundle::shared().isTestRunning())
return true;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldBeginEditingInDOMRange:");
InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), range));
InjectedBundle::shared().stringBuilder()->append("\n");
}
- return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
+ return InjectedBundle::shared().testRunner()->shouldAllowEditing();
}
bool InjectedBundlePage::shouldEndEditing(WKBundleRangeHandleRef range)
@@ -1449,12 +1449,12 @@ bool InjectedBundlePage::shouldEndEditing(WKBundleRangeHandleRef range)
if (!InjectedBundle::shared().isTestRunning())
return true;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldEndEditingInDOMRange:");
InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), range));
InjectedBundle::shared().stringBuilder()->append("\n");
}
- return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
+ return InjectedBundle::shared().testRunner()->shouldAllowEditing();
}
bool InjectedBundlePage::shouldInsertNode(WKBundleNodeHandleRef node, WKBundleRangeHandleRef rangeToReplace, WKInsertActionType action)
@@ -1468,7 +1468,7 @@ bool InjectedBundlePage::shouldInsertNode(WKBundleNodeHandleRef node, WKBundleRa
"WebViewInsertActionDropped",
};
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldInsertNode:");
InjectedBundle::shared().stringBuilder()->append(dumpPath(m_page, m_world.get(), node));
InjectedBundle::shared().stringBuilder()->append(" replacingDOMRange:");
@@ -1477,7 +1477,7 @@ bool InjectedBundlePage::shouldInsertNode(WKBundleNodeHandleRef node, WKBundleRa
InjectedBundle::shared().stringBuilder()->append(insertactionstring[action]);
InjectedBundle::shared().stringBuilder()->append("\n");
}
- return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
+ return InjectedBundle::shared().testRunner()->shouldAllowEditing();
}
bool InjectedBundlePage::shouldInsertText(WKStringRef text, WKBundleRangeHandleRef rangeToReplace, WKInsertActionType action)
@@ -1491,7 +1491,7 @@ bool InjectedBundlePage::shouldInsertText(WKStringRef text, WKBundleRangeHandleR
"WebViewInsertActionDropped",
};
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldInsertText:");
InjectedBundle::shared().stringBuilder()->append(toWTFString(text));
InjectedBundle::shared().stringBuilder()->append(" replacingDOMRange:");
@@ -1500,7 +1500,7 @@ bool InjectedBundlePage::shouldInsertText(WKStringRef text, WKBundleRangeHandleR
InjectedBundle::shared().stringBuilder()->append(insertactionstring[action]);
InjectedBundle::shared().stringBuilder()->append("\n");
}
- return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
+ return InjectedBundle::shared().testRunner()->shouldAllowEditing();
}
bool InjectedBundlePage::shouldDeleteRange(WKBundleRangeHandleRef range)
@@ -1508,12 +1508,12 @@ bool InjectedBundlePage::shouldDeleteRange(WKBundleRangeHandleRef range)
if (!InjectedBundle::shared().isTestRunning())
return true;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldDeleteDOMRange:");
InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), range));
InjectedBundle::shared().stringBuilder()->append("\n");
}
- return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
+ return InjectedBundle::shared().testRunner()->shouldAllowEditing();
}
bool InjectedBundlePage::shouldChangeSelectedRange(WKBundleRangeHandleRef fromRange, WKBundleRangeHandleRef toRange, WKAffinityType affinity, bool stillSelecting)
@@ -1530,7 +1530,7 @@ bool InjectedBundlePage::shouldChangeSelectedRange(WKBundleRangeHandleRef fromRa
"TRUE"
};
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldChangeSelectedDOMRange:");
InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), fromRange));
InjectedBundle::shared().stringBuilder()->append(" toDOMRange:");
@@ -1541,7 +1541,7 @@ bool InjectedBundlePage::shouldChangeSelectedRange(WKBundleRangeHandleRef fromRa
InjectedBundle::shared().stringBuilder()->append(boolstring[stillSelecting]);
InjectedBundle::shared().stringBuilder()->append("\n");
}
- return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
+ return InjectedBundle::shared().testRunner()->shouldAllowEditing();
}
bool InjectedBundlePage::shouldApplyStyle(WKBundleCSSStyleDeclarationRef style, WKBundleRangeHandleRef range)
@@ -1549,14 +1549,14 @@ bool InjectedBundlePage::shouldApplyStyle(WKBundleCSSStyleDeclarationRef style,
if (!InjectedBundle::shared().isTestRunning())
return true;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldApplyStyle:");
InjectedBundle::shared().stringBuilder()->append(styleDecToStr(style));
InjectedBundle::shared().stringBuilder()->append(" toElementsInDOMRange:");
InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), range));
InjectedBundle::shared().stringBuilder()->append("\n");
}
- return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
+ return InjectedBundle::shared().testRunner()->shouldAllowEditing();
}
void InjectedBundlePage::didBeginEditing(WKStringRef notificationName)
@@ -1564,7 +1564,7 @@ void InjectedBundlePage::didBeginEditing(WKStringRef notificationName)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidBeginEditing:");
InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
InjectedBundle::shared().stringBuilder()->append("\n");
@@ -1576,7 +1576,7 @@ void InjectedBundlePage::didEndEditing(WKStringRef notificationName)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidEndEditing:");
InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
InjectedBundle::shared().stringBuilder()->append("\n");
@@ -1588,7 +1588,7 @@ void InjectedBundlePage::didChange(WKStringRef notificationName)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidChange:");
InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
InjectedBundle::shared().stringBuilder()->append("\n");
@@ -1600,7 +1600,7 @@ void InjectedBundlePage::didChangeSelection(WKStringRef notificationName)
if (!InjectedBundle::shared().isTestRunning())
return;
- if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
+ if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidChangeSelection:");
InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
InjectedBundle::shared().stringBuilder()->append("\n");
@@ -1610,17 +1610,17 @@ void InjectedBundlePage::didChangeSelection(WKStringRef notificationName)
#if ENABLE(FULLSCREEN_API)
bool InjectedBundlePage::supportsFullScreen(WKBundlePageRef pageRef, WKFullScreenKeyboardRequestType requestType)
{
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+ if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
InjectedBundle::shared().stringBuilder()->append("supportsFullScreen() == true\n");
return true;
}
void InjectedBundlePage::enterFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
{
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+ if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
InjectedBundle::shared().stringBuilder()->append("enterFullScreenForElement()\n");
- if (!InjectedBundle::shared().layoutTestController()->hasCustomFullScreenBehavior()) {
+ if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
WKBundlePageWillEnterFullScreen(pageRef);
WKBundlePageDidEnterFullScreen(pageRef);
}
@@ -1628,10 +1628,10 @@ void InjectedBundlePage::enterFullScreenForElement(WKBundlePageRef pageRef, WKBu
void InjectedBundlePage::exitFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
{
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+ if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
InjectedBundle::shared().stringBuilder()->append("exitFullScreenForElement()\n");
- if (!InjectedBundle::shared().layoutTestController()->hasCustomFullScreenBehavior()) {
+ if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
WKBundlePageWillExitFullScreen(pageRef);
WKBundlePageDidExitFullScreen(pageRef);
}
@@ -1639,22 +1639,22 @@ void InjectedBundlePage::exitFullScreenForElement(WKBundlePageRef pageRef, WKBun
void InjectedBundlePage::beganEnterFullScreen(WKBundlePageRef, WKRect, WKRect)
{
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+ if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
InjectedBundle::shared().stringBuilder()->append("beganEnterFullScreen()\n");
}
void InjectedBundlePage::beganExitFullScreen(WKBundlePageRef, WKRect, WKRect)
{
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+ if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
InjectedBundle::shared().stringBuilder()->append("beganExitFullScreen()\n");
}
void InjectedBundlePage::closeFullScreen(WKBundlePageRef pageRef)
{
- if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+ if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
InjectedBundle::shared().stringBuilder()->append("closeFullScreen()\n");
- if (!InjectedBundle::shared().layoutTestController()->hasCustomFullScreenBehavior()) {
+ if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
WKBundlePageWillExitFullScreen(pageRef);
WKBundlePageDidExitFullScreen(pageRef);
}
View
8 Tools/WebKitTestRunner/InjectedBundle/Target.pri
@@ -22,14 +22,14 @@ SOURCES += \
EventSendingController.h \
GCController.cpp \
GCController.h \
- LayoutTestController.cpp \
- LayoutTestController.h \
+ TestRunner.cpp \
+ TestRunner.h \
TextInputController.cpp \
TextInputController.h \
Bindings/JSWrapper.cpp \
qt/ActivateFontsQt.cpp \
qt/InjectedBundleQt.cpp \
- qt/LayoutTestControllerQt.cpp
+ qt/TestRunnerQt.cpp
# Adds the generated sources to SOURCES
include(DerivedSources.pri)
@@ -45,7 +45,7 @@ HEADERS += \
GCController.h \
InjectedBundle.h \
InjectedBundlePage.h \
- LayoutTestController.h \
+ TestRunner.h \
TextInputController.h \
DESTDIR = $${ROOT_BUILD_DIR}/lib
View
180 ...r/InjectedBundle/LayoutTestController.cpp → ...tTestRunner/InjectedBundle/TestRunner.cpp
@@ -24,11 +24,11 @@
*/
#include "config.h"
-#include "LayoutTestController.h"
+#include "TestRunner.h"
#include "InjectedBundle.h"
#include "InjectedBundlePage.h"
-#include "JSLayoutTestController.h"
+#include "JSTestRunner.h"
#include "PlatformWebView.h"
#include "StringFunctions.h"
#include "TestController.h"
@@ -57,14 +57,14 @@ namespace WTR {
// This is lower than DumpRenderTree's timeout, to make it easier to work through the failures
// Eventually it should be changed to match.
-const double LayoutTestController::waitToDumpWatchdogTimerInterval = 6;
+const double TestRunner::waitToDumpWatchdogTimerInterval = 6;
-PassRefPtr<LayoutTestController> LayoutTestController::create()
+PassRefPtr<TestRunner> TestRunner::create()
{
- return adoptRef(new LayoutTestController);
+ return adoptRef(new TestRunner);
}
-LayoutTestController::LayoutTestController()
+TestRunner::TestRunner()
: m_whatToDump(RenderTree)
, m_shouldDumpAllFrameScrollPositions(false)
, m_shouldDumpBackForwardListsForAllWindows(false)
@@ -93,16 +93,16 @@ LayoutTestController::LayoutTestController()
platformInitialize();
}
-LayoutTestController::~LayoutTestController()
+TestRunner::~TestRunner()
{
}
-JSClassRef LayoutTestController::wrapperClass()
+JSClassRef TestRunner::wrapperClass()
{
- return JSLayoutTestController::layoutTestControllerClass();
+ return JSTestRunner::testRunnerClass();
}
-void LayoutTestController::display()
+void TestRunner::display()
{
WKBundlePageRef page = InjectedBundle::shared().page()->page();
WKBundlePageForceRepaint(page);
@@ -110,7 +110,7 @@ void LayoutTestController::display()
WKBundlePageResetTrackedRepaints(page);
}
-void LayoutTestController::dumpAsText(bool dumpPixels)
+void TestRunner::dumpAsText(bool dumpPixels)
{
if (m_whatToDump < MainFrameText)
m_whatToDump = MainFrameText;
@@ -118,26 +118,26 @@ void LayoutTestController::dumpAsText(bool dumpPixels)
}
// FIXME: Needs a full implementation see https://bugs.webkit.org/show_bug.cgi?id=42546
-void LayoutTestController::setCustomPolicyDelegate(bool enabled, bool permissive)
+void TestRunner::setCustomPolicyDelegate(bool enabled, bool permissive)
{
m_policyDelegateEnabled = enabled;
m_policyDelegatePermissive = permissive;
}
-void LayoutTestController::waitForPolicyDelegate()
+void TestRunner::waitForPolicyDelegate()
{
setCustomPolicyDelegate(true);
waitUntilDone();
}
-void LayoutTestController::waitUntilDone()
+void TestRunner::waitUntilDone()
{
m_waitToDump = true;
if (InjectedBundle::shared().useWaitToDumpWatchdogTimer())
initializeWaitToDumpWatchdogTimerIfNeeded();
}
-void LayoutTestController::waitToDumpWatchdogTimerFired()
+void TestRunner::waitToDumpWatchdogTimerFired()
{
invalidateWaitToDumpWatchdogTimer();
const char* message = "FAIL: Timed out waiting for notifyDone to be called\n";
@@ -146,7 +146,7 @@ void LayoutTestController::waitToDumpWatchdogTimerFired()
InjectedBundle::shared().done();
}
-void LayoutTestController::notifyDone()
+void TestRunner::notifyDone()
{
if (!InjectedBundle::shared().isTestRunning())
return;
@@ -157,7 +157,7 @@ void LayoutTestController::notifyDone()
m_waitToDump = false;
}
-unsigned LayoutTestController::numberOfActiveAnimations() const
+unsigned TestRunner::numberOfActiveAnimations() const
{
// FIXME: Is it OK this works only for the main frame?
// FIXME: If this is needed only for the main frame, then why is the function on WKBundleFrame instead of WKBundlePage?
@@ -165,7 +165,7 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
return WKBundleFrameGetNumberOfActiveAnimations(mainFrame);
}
-bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId)
+bool TestRunner::pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId)
{
// FIXME: Is it OK this works only for the main frame?
// FIXME: If this is needed only for the main frame, then why is the function on WKBundleFrame instead of WKBundlePage?
@@ -173,7 +173,7 @@ bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef anima
return WKBundleFramePauseAnimationOnElementWithId(mainFrame, toWK(animationName).get(), toWK(elementId).get(), time);
}
-bool LayoutTestController::pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId)
+bool TestRunner::pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId)
{
// FIXME: Is it OK this works only for the main frame?
// FIXME: If this is needed only for the main frame, then why is the function on WKBundleFrame instead of WKBundlePage?
@@ -181,20 +181,20 @@ bool LayoutTestController::pauseTransitionAtTimeOnElementWithId(JSStringRef prop
return WKBundleFramePauseTransitionOnElementWithId(mainFrame, toWK(propertyName).get(), toWK(elementId).get(), time);
}
-void LayoutTestController::suspendAnimations()
+void TestRunner::suspendAnimations()
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
WKBundleFrameSuspendAnimations(mainFrame);
}
-JSRetainPtr<JSStringRef> LayoutTestController::layerTreeAsText() const
+JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
WKRetainPtr<WKStringRef> text(AdoptWK, WKBundleFrameCopyLayerTreeAsText(mainFrame));
return toJS(text);
}
-void LayoutTestController::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
+void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
{
WKRetainPtr<WKStringRef> sourceWK = toWK(source);
WKRetainPtr<WKBundleScriptWorldRef> scriptWorld(AdoptWK, WKBundleScriptWorldCreateWorld());
@@ -204,7 +204,7 @@ void LayoutTestController::addUserScript(JSStringRef source, bool runAtStart, bo
(allFrames ? kWKInjectInAllFrames : kWKInjectInTopFrameOnly));
}
-void LayoutTestController::addUserStyleSheet(JSStringRef source, bool allFrames)
+void TestRunner::addUserStyleSheet(JSStringRef source, bool allFrames)
{
WKRetainPtr<WKStringRef> sourceWK = toWK(source);
WKRetainPtr<WKBundleScriptWorldRef> scriptWorld(AdoptWK, WKBundleScriptWorldCreateWorld());
@@ -213,12 +213,12 @@ void LayoutTestController::addUserStyleSheet(JSStringRef source, bool allFrames)
(allFrames ? kWKInjectInAllFrames : kWKInjectInTopFrameOnly));
}
-void LayoutTestController::keepWebHistory()
+void TestRunner::keepWebHistory()
{
WKBundleSetShouldTrackVisitedLinks(InjectedBundle::shared().bundle(), true);
}
-JSValueRef LayoutTestController::computedStyleIncludingVisitedInfo(JSValueRef element)
+JSValueRef TestRunner::computedStyleIncludingVisitedInfo(JSValueRef element)
{
// FIXME: Is it OK this works only for the main frame?
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
@@ -231,7 +231,7 @@ JSValueRef LayoutTestController::computedStyleIncludingVisitedInfo(JSValueRef el
return value;
}
-JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSValueRef element)
+JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSValueRef element)
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
@@ -243,12 +243,12 @@ JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSValueRef
return toJS(text);
}
-void LayoutTestController::execCommand(JSStringRef name, JSStringRef argument)
+void TestRunner::execCommand(JSStringRef name, JSStringRef argument)
{
WKBundlePageExecuteEditingCommand(InjectedBundle::shared().page()->page(), toWK(name).get(), toWK(argument).get());
}
-bool LayoutTestController::findString(JSStringRef target, JSValueRef optionsArrayAsValue)
+bool TestRunner::findString(JSStringRef target, JSValueRef optionsArrayAsValue)
{
WKFindOptions options = 0;
@@ -286,117 +286,117 @@ bool LayoutTestController::findString(JSStringRef target, JSValueRef optionsArra
return WKBundlePageFindString(InjectedBundle::shared().page()->page(), toWK(target).get(), options);
}
-void LayoutTestController::clearAllDatabases()
+void TestRunner::clearAllDatabases()
{
WKBundleClearAllDatabases(InjectedBundle::shared().bundle());
}
-void LayoutTestController::setDatabaseQuota(uint64_t quota)
+void TestRunner::setDatabaseQuota(uint64_t quota)
{
return WKBundleSetDatabaseQuota(InjectedBundle::shared().bundle(), quota);
}
-void LayoutTestController::clearAllApplicationCaches()
+void TestRunner::clearAllApplicationCaches()
{
WKBundleClearApplicationCache(InjectedBundle::shared().bundle());
}
-void LayoutTestController::setAppCacheMaximumSize(uint64_t size)
+void TestRunner::setAppCacheMaximumSize(uint64_t size)
{
WKBundleSetAppCacheMaximumSize(InjectedBundle::shared().bundle(), size);
}
-bool LayoutTestController::isCommandEnabled(JSStringRef name)
+bool TestRunner::isCommandEnabled(JSStringRef name)
{
return WKBundlePageIsEditingCommandEnabled(InjectedBundle::shared().page()->page(), toWK(name).get());
}
-void LayoutTestController::setCanOpenWindows(bool)
+void TestRunner::setCanOpenWindows(bool)
{
// It's not clear if or why any tests require opening windows be forbidden.
// For now, just ignore this setting, and if we find later it's needed we can add it.
}
-void LayoutTestController::setXSSAuditorEnabled(bool enabled)
+void TestRunner::setXSSAuditorEnabled(bool enabled)
{
WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitXSSAuditorEnabled"));
WKBundleOverrideBoolPreferenceForTestRunner(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), key.get(), enabled);
}
-void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
+void TestRunner::setAllowUniversalAccessFromFileURLs(bool enabled)
{
WKBundleSetAllowUniversalAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setAllowFileAccessFromFileURLs(bool enabled)
+void TestRunner::setAllowFileAccessFromFileURLs(bool enabled)
{
WKBundleSetAllowFileAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setFrameFlatteningEnabled(bool enabled)
+void TestRunner::setFrameFlatteningEnabled(bool enabled)
{
WKBundleSetFrameFlatteningEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setPluginsEnabled(bool enabled)
+void TestRunner::setPluginsEnabled(bool enabled)
{
WKBundleSetPluginsEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setGeolocationPermission(bool enabled)
+void TestRunner::setGeolocationPermission(bool enabled)
{
WKBundleSetGeolocationPermission(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setJavaScriptCanAccessClipboard(bool enabled)
+void TestRunner::setJavaScriptCanAccessClipboard(bool enabled)
{
WKBundleSetJavaScriptCanAccessClipboard(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setPrivateBrowsingEnabled(bool enabled)
+void TestRunner::setPrivateBrowsingEnabled(bool enabled)
{
WKBundleSetPrivateBrowsingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setPopupBlockingEnabled(bool enabled)
+void TestRunner::setPopupBlockingEnabled(bool enabled)
{
WKBundleSetPopupBlockingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::setAuthorAndUserStylesEnabled(bool enabled)
+void TestRunner::setAuthorAndUserStylesEnabled(bool enabled)
{
WKBundleSetAuthorAndUserStylesEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
-void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
+void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
{
WKBundleAddOriginAccessWhitelistEntry(InjectedBundle::shared().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
}
-void LayoutTestController::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
+void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
{
WKBundleRemoveOriginAccessWhitelistEntry(InjectedBundle::shared().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
}
-int LayoutTestController::numberOfPages(double pageWidthInPixels, double pageHeightInPixels)
+int TestRunner::numberOfPages(double pageWidthInPixels, double pageHeightInPixels)
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
return WKBundleNumberOfPages(InjectedBundle::shared().bundle(), mainFrame, pageWidthInPixels, pageHeightInPixels);
}
-JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
+JSRetainPtr<JSStringRef> TestRunner::pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
return toJS(WKBundlePageSizeAndMarginsInPixels(InjectedBundle::shared().bundle(), mainFrame, pageIndex, width, height, marginTop, marginRight, marginBottom, marginLeft));
}
-bool LayoutTestController::isPageBoxVisible(int pageIndex)
+bool TestRunner::isPageBoxVisible(int pageIndex)
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
return WKBundleIsPageBoxVisible(InjectedBundle::shared().bundle(), mainFrame, pageIndex);
}
-void LayoutTestController::setValueForUser(JSContextRef context, JSValueRef element, JSStringRef value)
+void TestRunner::setValueForUser(JSContextRef context, JSValueRef element, JSStringRef value)
{
if (!element || !JSValueIsObject(context, element))
return;
@@ -405,38 +405,38 @@ void LayoutTestController::setValueForUser(JSContextRef context, JSValueRef elem
WKBundleNodeHandleSetHTMLInputElementValueForUser(nodeHandle.get(), toWK(value).get());
}
-unsigned LayoutTestController::windowCount()
+unsigned TestRunner::windowCount()
{
return InjectedBundle::shared().pageCount();
}
-void LayoutTestController::clearBackForwardList()
+void TestRunner::clearBackForwardList()
{
WKBundleBackForwardListClear(WKBundlePageGetBackForwardList(InjectedBundle::shared().page()->page()));
}
// Object Creation
-void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
+void TestRunner::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
{
setProperty(context, windowObject, "testRunner", this, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
}
-void LayoutTestController::showWebInspector()
+void TestRunner::showWebInspector()
{
#if ENABLE(INSPECTOR)
WKBundleInspectorShow(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()));
#endif // ENABLE(INSPECTOR)
}
-void LayoutTestController::closeWebInspector()
+void TestRunner::closeWebInspector()
{
#if ENABLE(INSPECTOR)
WKBundleInspectorClose(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()));
#endif // ENABLE(INSPECTOR)
}
-void LayoutTestController::evaluateInWebInspector(long callID, JSStringRef script)
+void TestRunner::evaluateInWebInspector(long callID, JSStringRef script)
{
#if ENABLE(INSPECTOR)
WKRetainPtr<WKStringRef> scriptWK = toWK(script);
@@ -451,7 +451,7 @@ static WorldMap& worldMap()
return map;
}
-unsigned LayoutTestController::worldIDForWorld(WKBundleScriptWorldRef world)
+unsigned TestRunner::worldIDForWorld(WKBundleScriptWorldRef world)
{
WorldMap::const_iterator end = worldMap().end();
for (WorldMap::const_iterator it = worldMap().begin(); it != end; ++it) {
@@ -462,7 +462,7 @@ unsigned LayoutTestController::worldIDForWorld(WKBundleScriptWorldRef world)
return 0;
}
-void LayoutTestController::evaluateScriptInIsolatedWorld(JSContextRef context, unsigned worldID, JSStringRef script)
+void TestRunner::evaluateScriptInIsolatedWorld(JSContextRef context, unsigned worldID, JSStringRef script)
{
// A worldID of 0 always corresponds to a new world. Any other worldID corresponds to a world
// that is created once and cached forever.
@@ -484,30 +484,30 @@ void LayoutTestController::evaluateScriptInIsolatedWorld(JSContextRef context, u
JSEvaluateScript(jsContext, script, 0, 0, 0, 0);
}
-void LayoutTestController::setPOSIXLocale(JSStringRef locale)
+void TestRunner::setPOSIXLocale(JSStringRef locale)
{
char localeBuf[32];
JSStringGetUTF8CString(locale, localeBuf, sizeof(localeBuf));
setlocale(LC_ALL, localeBuf);
}
-void LayoutTestController::setTextDirection(JSStringRef direction)
+void TestRunner::setTextDirection(JSStringRef direction)
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
return WKBundleFrameSetTextDirection(mainFrame, toWK(direction).get());
}
-void LayoutTestController::setShouldStayOnPageAfterHandlingBeforeUnload(bool shouldStayOnPage)
+void TestRunner::setShouldStayOnPageAfterHandlingBeforeUnload(bool shouldStayOnPage)
{
InjectedBundle::shared().postNewBeforeUnloadReturnValue(!shouldStayOnPage);
}
-void LayoutTestController::setDefersLoading(bool shouldDeferLoading)
+void TestRunner::setDefersLoading(bool shouldDeferLoading)
{
WKBundlePageSetDefersLoading(InjectedBundle::shared().page()->page(), shouldDeferLoading);
}
-void LayoutTestController::setPageVisibility(JSStringRef state)
+void TestRunner::setPageVisibility(JSStringRef state)
{
WebCore::PageVisibilityState visibilityState = WebCore::PageVisibilityStateVisible;
@@ -521,7 +521,7 @@ void LayoutTestController::setPageVisibility(JSStringRef state)
WKBundleSetPageVisibilityState(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page(), visibilityState, /* isInitialState */ false);
}
-void LayoutTestController::resetPageVisibility()
+void TestRunner::resetPageVisibility()
{
WKBundleSetPageVisibilityState(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page(), WebCore::PageVisibilityStateVisible, /* isInitialState */ true);
}
@@ -540,7 +540,7 @@ enum {
SetBackingScaleFactorCallbackID
};
-static void cacheLayoutTestControllerCallback(unsigned index, JSValueRef callback)
+static void cacheTestRunnerCallback(unsigned index, JSValueRef callback)
{
if (!callback)
return;
@@ -551,7 +551,7 @@ static void cacheLayoutTestControllerCallback(unsigned index, JSValueRef callbac
callbackMap().add(index, callback);
}
-static void callLayoutTestControllerCallback(unsigned index)
+static void callTestRunnerCallback(unsigned index)
{
if (!callbackMap().contains(index))
return;
@@ -562,61 +562,61 @@ static void callLayoutTestControllerCallback(unsigned index)
JSValueUnprotect(context, callback);
}
-void LayoutTestController::addChromeInputField(JSValueRef callback)
+void TestRunner::addChromeInputField(JSValueRef callback)
{
- cacheLayoutTestControllerCallback(AddChromeInputFieldCallbackID, callback);
+ cacheTestRunnerCallback(AddChromeInputFieldCallbackID, callback);
InjectedBundle::shared().postAddChromeInputField();
}
-void LayoutTestController::removeChromeInputField(JSValueRef callback)
+void TestRunner::removeChromeInputField(JSValueRef callback)
{
- cacheLayoutTestControllerCallback(RemoveChromeInputFieldCallbackID, callback);
+ cacheTestRunnerCallback(RemoveChromeInputFieldCallbackID, callback);
InjectedBundle::shared().postRemoveChromeInputField();
}
-void LayoutTestController::focusWebView(JSValueRef callback)
+void TestRunner::focusWebView(JSValueRef callback)
{
- cacheLayoutTestControllerCallback(FocusWebViewCallbackID, callback);
+ cacheTestRunnerCallback(FocusWebViewCallbackID, callback);
InjectedBundle::shared().postFocusWebView();
}
-void LayoutTestController::setBackingScaleFactor(double backingScaleFactor, JSValueRef callback)
+void TestRunner::setBackingScaleFactor(double backingScaleFactor, JSValueRef callback)
{
- cacheLayoutTestControllerCallback(SetBackingScaleFactorCallbackID, callback);
+ cacheTestRunnerCallback(SetBackingScaleFactorCallbackID, callback);
InjectedBundle::shared().postSetBackingScaleFactor(backingScaleFactor);
}
-void LayoutTestController::setWindowIsKey(bool isKey)
+void TestRunner::setWindowIsKey(bool isKey)
{
InjectedBundle::shared().postSetWindowIsKey(isKey);
}
-void LayoutTestController::callAddChromeInputFieldCallback()
+void TestRunner::callAddChromeInputFieldCallback()
{
- callLayoutTestControllerCallback(AddChromeInputFieldCallbackID);
+ callTestRunnerCallback(AddChromeInputFieldCallbackID);
}
-void LayoutTestController::callRemoveChromeInputFieldCallback()
+void TestRunner::callRemoveChromeInputFieldCallback()
{
- callLayoutTestControllerCallback(RemoveChromeInputFieldCallbackID);
+ callTestRunnerCallback(RemoveChromeInputFieldCallbackID);
}
-void LayoutTestController::callFocusWebViewCallback()
+void TestRunner::callFocusWebViewCallback()
{
- callLayoutTestControllerCallback(FocusWebViewCallbackID);
+ callTestRunnerCallback(FocusWebViewCallbackID);
}
-void LayoutTestController::callSetBackingScaleFactorCallback()
+void TestRunner::callSetBackingScaleFactorCallback()
{
- callLayoutTestControllerCallback(SetBackingScaleFactorCallbackID);
+ callTestRunnerCallback(SetBackingScaleFactorCallbackID);
}
-void LayoutTestController::overridePreference(JSStringRef preference, bool value)
+void TestRunner::overridePreference(JSStringRef preference, bool value)
{
WKBundleOverrideBoolPreferenceForTestRunner(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), toWK(preference).get(), value);
}
-void LayoutTestController::sendWebIntentResponse(JSStringRef reply)
+void TestRunner::sendWebIntentResponse(JSStringRef reply)
{
#if ENABLE(WEB_INTENTS)
WKRetainPtr<WKBundleIntentRequestRef> currentRequest = InjectedBundle::shared().page()->currentIntentRequest();
@@ -637,7 +637,7 @@ void LayoutTestController::sendWebIntentResponse(JSStringRef reply)
#endif
}
-void LayoutTestController::deliverWebIntent(JSStringRef action, JSStringRef type, JSStringRef data)
+void TestRunner::deliverWebIntent(JSStringRef action, JSStringRef type, JSStringRef data)
{
#if ENABLE(WEB_INTENTS)
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
@@ -657,17 +657,17 @@ void LayoutTestController::deliverWebIntent(JSStringRef action, JSStringRef type
#endif
}
-void LayoutTestController::setAlwaysAcceptCookies(bool accept)
+void TestRunner::setAlwaysAcceptCookies(bool accept)
{
WKBundleSetAlwaysAcceptCookies(InjectedBundle::shared().bundle(), accept);
}
-double LayoutTestController::preciseTime()
+double TestRunner::preciseTime()
{
return currentTime();
}
-void LayoutTestController::setUserStyleSheetEnabled(bool enabled)
+void TestRunner::setUserStyleSheetEnabled(bool enabled)
{
m_userStyleSheetEnabled = enabled;
@@ -676,7 +676,7 @@ void LayoutTestController::setUserStyleSheetEnabled(bool enabled)
WKBundleSetUserStyleSheetLocation(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), location);
}
-void LayoutTestController::setUserStyleSheetLocation(JSStringRef location)
+void TestRunner::setUserStyleSheetLocation(JSStringRef location)
{
m_userStyleSheetLocation = adoptWK(WKStringCreateWithJSString(location));
View
14 ...ner/InjectedBundle/LayoutTestController.h → ...KitTestRunner/InjectedBundle/TestRunner.h
@@ -23,8 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LayoutTestController_h
-#define LayoutTestController_h
+#ifndef TestRunner_h
+#define TestRunner_h
#include "JSWrappable.h"
#include <JavaScriptCore/JSRetainPtr.h>
@@ -51,10 +51,10 @@ typedef Ecore_Timer* PlatformTimerRef;
namespace WTR {
-class LayoutTestController : public JSWrappable {
+class TestRunner : public JSWrappable {
public:
- static PassRefPtr<LayoutTestController> create();
- virtual ~LayoutTestController();
+ static PassRefPtr<TestRunner> create();
+ virtual ~TestRunner();
// JSWrappable
virtual JSClassRef wrapperClass();
@@ -232,7 +232,7 @@ class LayoutTestController : public JSWrappable {
private:
static const double waitToDumpWatchdogTimerInterval;
- LayoutTestController();
+ TestRunner();
void platformInitialize();
void initializeWaitToDumpWatchdogTimerIfNeeded();
@@ -273,4 +273,4 @@ class LayoutTestController : public JSWrappable {
} // namespace WTR
-#endif // LayoutTestController_h
+#endif // TestRunner_h
View
14 ...tedBundle/efl/LayoutTestControllerEfl.cpp → ...nner/InjectedBundle/efl/TestRunnerEfl.cpp
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "LayoutTestController.h"
+#include "TestRunner.h"
#include "InjectedBundle.h"
#include <Ecore.h>
@@ -27,16 +27,16 @@ namespace WTR {
static Eina_Bool waitToDumpWatchdogTimerCallback(void*)
{
- InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
+ InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
return false;
}
-void LayoutTestController::platformInitialize()
+void TestRunner::platformInitialize()
{
m_waitToDumpWatchdogTimer = 0;
}
-void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
+void TestRunner::invalidateWaitToDumpWatchdogTimer()
{
if (!m_waitToDumpWatchdogTimer)
return;
@@ -45,7 +45,7 @@ void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
m_waitToDumpWatchdogTimer = 0;
}
-void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
+void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
{
if (m_waitToDumpWatchdogTimer)
return;
@@ -54,12 +54,12 @@ void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
waitToDumpWatchdogTimerCallback, 0);
}
-JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
+JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
{
return url;
}
-JSRetainPtr<JSStringRef> LayoutTestController::platformName()
+JSRetainPtr<JSStringRef> TestRunner::platformName()
{
JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("efl"));
return platformName;
View
14 ...tedBundle/gtk/LayoutTestControllerGtk.cpp → ...nner/InjectedBundle/gtk/TestRunnerGtk.cpp
@@ -25,7 +25,7 @@
*/
#include "config.h"
-#include "LayoutTestController.h"
+#include "TestRunner.h"
#include "InjectedBundle.h"
#include <glib.h>
@@ -34,16 +34,16 @@ namespace WTR {
static gboolean waitToDumpWatchdogTimerCallback(gpointer)
{
- InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
+ InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
return FALSE;
}
-void LayoutTestController::platformInitialize()
+void TestRunner::platformInitialize()
{
m_waitToDumpWatchdogTimer = 0;
}
-void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
+void TestRunner::invalidateWaitToDumpWatchdogTimer()
{
if (!m_waitToDumpWatchdogTimer)
return;
@@ -51,7 +51,7 @@ void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
m_waitToDumpWatchdogTimer = 0;
}
-void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
+void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
{
if (m_waitToDumpWatchdogTimer)
return;
@@ -60,12 +60,12 @@ void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
waitToDumpWatchdogTimerCallback, 0);
}
-JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
+JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
{
return url;
}
-JSRetainPtr<JSStringRef> LayoutTestController::platformName()
+JSRetainPtr<JSStringRef> TestRunner::platformName()
{
JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("gtk"));
return platformName;
View
14 ...ctedBundle/mac/LayoutTestControllerMac.mm → ...unner/InjectedBundle/mac/TestRunnerMac.mm
@@ -23,17 +23,17 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "LayoutTestController.h"
+#include "TestRunner.h"
#include "InjectedBundle.h"
namespace WTR {
-void LayoutTestController::platformInitialize()
+void TestRunner::platformInitialize()
{
}
-void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
+void TestRunner::invalidateWaitToDumpWatchdogTimer()
{
if (!m_waitToDumpWatchdogTimer)
return;
@@ -44,10 +44,10 @@
static void waitUntilDoneWatchdogTimerFired(CFRunLoopTimerRef timer, void* info)
{
- InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
+ InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
}
-void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
+void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
{
if (m_waitToDumpWatchdogTimer)
return;
@@ -56,12 +56,12 @@ static void waitUntilDoneWatchdogTimerFired(CFRunLoopTimerRef timer, void* info)
CFRunLoopAddTimer(CFRunLoopGetCurrent(), m_waitToDumpWatchdogTimer.get(), kCFRunLoopCommonModes);
}
-JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
+JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
{
return JSStringRetain(url); // Do nothing on mac.
}
-JSRetainPtr<JSStringRef> LayoutTestController::platformName()
+JSRetainPtr<JSStringRef> TestRunner::platformName()
{
JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
return platformName;
View
16 ...ectedBundle/qt/LayoutTestControllerQt.cpp → ...Runner/InjectedBundle/qt/TestRunnerQt.cpp
@@ -25,7 +25,7 @@
*/
#include "config.h"
-#include "LayoutTestController.h"
+#include "TestRunner.h"
#include "ActivateFonts.h"
#include "InjectedBundle.h"
@@ -50,14 +50,14 @@ class WatchdogTimerHelper : public QObject {
public Q_SLOTS:
void timerFired()
{
- InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
+ InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
}
private:
WatchdogTimerHelper() {}
};
-void LayoutTestController::platformInitialize()
+void TestRunner::platformInitialize()
{
// Make WebKit2 mimic the behaviour of DumpRenderTree, which is incorrect,
// but tests are successfully passed. On the long run, Qt will move to QRawFont,
@@ -69,12 +69,12 @@ void LayoutTestController::platformInitialize()
QObject::connect(&m_waitToDumpWatchdogTimer, SIGNAL(timeout()), WatchdogTimerHelper::instance(), SLOT(timerFired()));
}
-void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
+void TestRunner::invalidateWaitToDumpWatchdogTimer()
{
m_waitToDumpWatchdogTimer.stop();
}
-void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
+void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
{
if (qgetenv("QT_WEBKIT2_DEBUG") == "1")
return;
@@ -85,7 +85,7 @@ void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
m_waitToDumpWatchdogTimer.start(waitToDumpWatchdogTimerInterval * 1000);
}
-JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
+JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
{
QString localTmpUrl(QStringLiteral("file:///tmp/LayoutTests"));
QString givenUrl(reinterpret_cast<const QChar*>(JSStringGetCharactersPtr(url)), JSStringGetLength(url));
@@ -104,7 +104,7 @@ JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef u
return url;
}
-JSRetainPtr<JSStringRef> LayoutTestController::platformName()
+JSRetainPtr<JSStringRef> TestRunner::platformName()
{
JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("qt"));
return platformName;
@@ -112,4 +112,4 @@ JSRetainPtr<JSStringRef> LayoutTestController::platformName()
} // namespace WTR
-#include "LayoutTestControllerQt.moc"
+#include "TestRunnerQt.moc"
View
14 ...tedBundle/win/LayoutTestControllerWin.cpp → ...nner/InjectedBundle/win/TestRunnerWin.cpp
@@ -24,18 +24,18 @@
*/
#include "config.h"
-#include "LayoutTestController.h"
+#include "TestRunner.h"
#include "InjectedBundle.h"
namespace WTR {
-void LayoutTestController::platformInitialize()
+void TestRunner::platformInitialize()
{
m_waitToDumpWatchdogTimer = 0;
}
-void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
+void TestRunner::invalidateWaitToDumpWatchdogTimer()
{
if (!m_waitToDumpWatchdogTimer)
return;
@@ -46,12 +46,12 @@ void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
static void CALLBACK waitToDumpWatchdogTimerFired(HWND, UINT, UINT_PTR, DWORD)
{
- InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
+ InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
}
static const UINT_PTR waitToDumpWatchdogTimerIdentifier = 1;
-void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
+void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
{
if (m_waitToDumpWatchdogTimer)
return;
@@ -59,12 +59,12 @@ void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
m_waitToDumpWatchdogTimer = ::SetTimer(0, waitToDumpWatchdogTimerIdentifier, waitToDumpWatchdogTimerInterval * 1000, WTR::waitToDumpWatchdogTimerFired);
}
-JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
+JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
{
return JSStringRetain(url); // TODO.
}
-JSRetainPtr<JSStringRef> LayoutTestController::platformName()
+JSRetainPtr<JSStringRef> TestRunner::platformName()
{
JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));
return platformName;
View
2 Tools/WebKitTestRunner/PlatformEfl.cmake
@@ -51,7 +51,7 @@ LIST(APPEND WebKitTestRunnerInjectedBundle_SOURCES
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/LayoutTestControllerEfl.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/TestRunnerEfl.cpp
)
# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
View
36 Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
@@ -71,13 +71,13 @@
BC8FD8D2120E545B00F3E71A /* JSEventSendingController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8FD8D0120E545B00F3E71A /* JSEventSendingController.cpp */; };
BC9192051333E4F8003011DC /* TestInvocationCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9192041333E4F8003011DC /* TestInvocationCG.cpp */; };
BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952C0C11F3B965003398B4 /* JSWrapper.cpp */; };
- BC952F1F11F3C652003398B4 /* JSLayoutTestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */; };
+ BC952F1F11F3C652003398B4 /* JSTestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952F1D11F3C652003398B4 /* JSTestRunner.cpp */; };
BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */; };
BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */; };
- BCC9981811D3F51E0017BCA2 /* LayoutTestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */; };
+ BCC9981811D3F51E0017BCA2 /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD7D2F711921278006DB7EE /* TestInvocation.cpp */; };
BCDA2B9A1191051F00C3BC47 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */; };
- C0CE720B1247C93300BC0EC4 /* LayoutTestControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0CE720A1247C93300BC0EC4 /* LayoutTestControllerMac.mm */; };
+ C0CE720B1247C93300BC0EC4 /* TestRunnerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -185,21 +185,21 @@
BC952C0C11F3B965003398B4 /* JSWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapper.cpp; sourceTree = "<group>"; };
BC952C0E11F3B97B003398B4 /* JSWrappable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWrappable.h; sourceTree = "<group>"; };
BC952EC511F3C10F003398B4 /* DerivedSources.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DerivedSources.make; sourceTree = "<group>"; };
- BC952ED211F3C29F003398B4 /* LayoutTestController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LayoutTestController.idl; sourceTree = "<group>"; };
+ BC952ED211F3C29F003398B4 /* TestRunner.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestRunner.idl; sourceTree = "<group>"; };
BC952ED311F3C318003398B4 /* CodeGeneratorTestRunner.pm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = CodeGeneratorTestRunner.pm; sourceTree = "<group>"; };
- BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSLayoutTestController.cpp; path = DerivedSources/WebKitTestRunner/JSLayoutTestController.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
- BC952F1E11F3C652003398B4 /* JSLayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSLayoutTestController.h; path = DerivedSources/WebKitTestRunner/JSLayoutTestController.h; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC952F1D11F3C652003398B4 /* JSTestRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSTestRunner.cpp; path = DerivedSources/WebKitTestRunner/JSTestRunner.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC952F1E11F3C652003398B4 /* JSTestRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSTestRunner.h; path = DerivedSources/WebKitTestRunner/JSTestRunner.h; sourceTree = BUILT_PRODUCTS_DIR; };
BC99A4841208901A007E9F08 /* StringFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringFunctions.h; sourceTree = "<group>"; };
BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundle.cpp; sourceTree = "<group>"; };
BCC997A111D3C8F60017BCA2 /* InjectedBundle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundle.h; sourceTree = "<group>"; };
BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePage.cpp; sourceTree = "<group>"; };
BCC997A311D3C8F60017BCA2 /* InjectedBundlePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePage.h; sourceTree = "<group>"; };
- BCC9981611D3F51E0017BCA2 /* LayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutTestController.h; sourceTree = "<group>"; };
- BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutTestController.cpp; sourceTree = "<group>"; };
+ BCC9981611D3F51E0017BCA2 /* TestRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestRunner.h; sourceTree = "<group>"; };
+ BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestRunner.cpp; sourceTree = "<group>"; };
BCD7D2F611921278006DB7EE /* TestInvocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestInvocation.h; sourceTree = "<group>"; };
BCD7D2F711921278006DB7EE /* TestInvocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestInvocation.cpp; sourceTree = "<group>"; };
BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- C0CE720A1247C93300BC0EC4 /* LayoutTestControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LayoutTestControllerMac.mm; path = mac/LayoutTestControllerMac.mm; sourceTree = "<group>"; };
+ C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestRunnerMac.mm; path = mac/TestRunnerMac.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -324,9 +324,9 @@
BC8FD8C8120E527F00F3E71A /* EventSendingController.h */,
BC14E4D9120E02D000826C0C /* GCController.cpp */,
BC14E4D8120E02D000826C0C /* GCController.h */,
- BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */,
- BCC9981611D3F51E0017BCA2 /* LayoutTestController.h */,
- C0CE720A1247C93300BC0EC4 /* LayoutTestControllerMac.mm */,
+ BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */,
+ BCC9981611D3F51E0017BCA2 /* TestRunner.h */,
+ C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */,
5664A49814326384008881BE /* TextInputController.cpp */,
5664A49914326384008881BE /* TextInputController.h */,
);
@@ -412,7 +412,7 @@
29210EDC144CD56E00835BB5 /* AccessibilityUIElement.idl */,
BC8FD8CB120E52B000F3E71A /* EventSendingController.idl */,
BC14E4E1120E032000826C0C /* GCController.idl */,
- BC952ED211F3C29F003398B4 /* LayoutTestController.idl */,
+ BC952ED211F3C29F003398B4 /* TestRunner.idl */,
5664A49614326377008881BE /* TextInputController.idl */,
);
path = Bindings;
@@ -433,8 +433,8 @@
BC8FD8D1120E545B00F3E71A /* JSEventSendingController.h */,
BC14E4E8120E03D800826C0C /* JSGCController.cpp */,
BC14E4E9120E03D800826C0C /* JSGCController.h */,
- BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */,
- BC952F1E11F3C652003398B4 /* JSLayoutTestController.h */,
+ BC952F1D11F3C652003398B4 /* JSTestRunner.cpp */,
+ BC952F1E11F3C652003398B4 /* JSTestRunner.h */,
5641E2CE14335E95008307E5 /* JSTextInputController.cpp */,
5641E2CF14335E95008307E5 /* JSTextInputController.h */,
);
@@ -577,16 +577,16 @@
BC251A3E11D16831002EBC01 /* InjectedBundleMain.cpp in Sources */,
BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */,
BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */,
- BCC9981811D3F51E0017BCA2 /* LayoutTestController.cpp in Sources */,
+ BCC9981811D3F51E0017BCA2 /* TestRunner.cpp in Sources */,
65EB85A011EC67CC0034D300 /* ActivateFonts.mm in Sources */,
BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */,
- BC952F1F11F3C652003398B4 /* JSLayoutTestController.cpp in Sources */,
+ BC952F1F11F3C652003398B4 /* JSTestRunner.cpp in Sources */,
BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */,
BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */,
BC8DAD7B1316D91000EC96FC /* InjectedBundleMac.mm in Sources */,
BC8FD8CA120E527F00F3E71A /* EventSendingController.cpp in Sources */,
BC8FD8D2120E545B00F3E71A /* JSEventSendingController.cpp in Sources */,
- C0CE720B1247C93300BC0EC4 /* LayoutTestControllerMac.mm in Sources */,
+ C0CE720B1247C93300BC0EC4 /* TestRunnerMac.mm in Sources */,
5664A49A14326384008881BE /* TextInputController.cpp in Sources */,
5641E2D014335E95008307E5 /* JSTextInputController.cpp in Sources */,
29210EAE144CACB700835BB5 /* AccessibilityUIElement.cpp in Sources */,
View
12 Tools/WebKitTestRunner/win/InjectedBundle.vcproj
@@ -718,7 +718,7 @@
>
</File>
<File
- RelativePath="..\InjectedBundle\Bindings\LayoutTestController.idl"
+ RelativePath="..\InjectedBundle\Bindings\TestRunner.idl"
>
<FileConfiguration
Name="Debug|Win32"
@@ -874,11 +874,11 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.cpp"
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTestRunner.cpp"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.h"
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTestRunner.h"
>
</File>
<File
@@ -967,15 +967,15 @@
>
</File>
<File
- RelativePath="..\InjectedBundle\LayoutTestController.cpp"
+ RelativePath="..\InjectedBundle\TestRunner.cpp"
>
</File>
<File
- RelativePath="..\InjectedBundle\LayoutTestController.h"
+ RelativePath="..\InjectedBundle\TestRunner.h"
>
</File>
<File
- RelativePath="..\InjectedBundle\win\LayoutTestControllerWin.cpp"
+ RelativePath="..\InjectedBundle\win\TestRunnerWin.cpp"
>
</File>
<File

0 comments on commit 8dad49f

Please sign in to comment.
Something went wrong with that request. Please try again.