Permalink
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...
rniwa committed Aug 16, 2012
1 parent e02e1f4 commit 8dad49fd79620fd5be3727b33af04c58c73a64c2
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
@@ -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
@@ -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
@@ -32,7 +32,7 @@ INTERFACES = \
AccessibilityUIElement \
EventSendingController \
GCController \
- LayoutTestController \
+ TestRunner \
TextInputController \
#
@@ -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
@@ -25,7 +25,7 @@
module WTR {
- interface LayoutTestController {
+ interface TestRunner {
// The basics.
void dumpAsText(in boolean dumpPixels);
void dumpChildFramesAsText();
@@ -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
@@ -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();
@@ -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;
Oops, something went wrong.

0 comments on commit 8dad49f

Please sign in to comment.