Changeset 125732 in webkit


Ignore:
Timestamp:
Aug 15, 2012 6:22:26 PM (12 years ago)
Author:
rniwa@webkit.org
Message:

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:
Location:
trunk/Tools
Files:
12 edited
8 moved

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r125726 r125732  
     12012-08-15  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Rename LayoutTestController to TestRunner in WebKitTestRunner
     4        https://bugs.webkit.org/show_bug.cgi?id=93942
     5
     6        Reviewed by Simon Fraser.
     7
     8        Renamed the class and relevant files.
     9
     10        * WebKitTestRunner/CMakeLists.txt:
     11        * WebKitTestRunner/DerivedSources.make:
     12        * WebKitTestRunner/GNUmakefile.am:
     13        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: Removed.
     14        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Copied from Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl.
     15        * WebKitTestRunner/InjectedBundle/DerivedSources.pri:
     16        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
     17        (WTR::InjectedBundle::didReceiveMessage):
     18        (WTR::InjectedBundle::beginTesting):
     19        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
     20        (WTR::InjectedBundle::testRunner):
     21        (InjectedBundle):
     22        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     23        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: Removed.
     24        * WebKitTestRunner/InjectedBundle/LayoutTestController.h: Removed.
     25        * WebKitTestRunner/InjectedBundle/Target.pri:
     26        * WebKitTestRunner/InjectedBundle/TestRunner.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp.
     27        * WebKitTestRunner/InjectedBundle/TestRunner.h: Copied from Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h.
     28        (TestRunner):
     29        * WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp: Removed.
     30        * WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp.
     31        (WTR::waitToDumpWatchdogTimerCallback):
     32        (WTR::TestRunner::platformInitialize):
     33        (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
     34        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
     35        (WTR::TestRunner::pathToLocalResource):
     36        (WTR::TestRunner::platformName):
     37        * WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp: Removed.
     38        * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp.
     39        (WTR::waitToDumpWatchdogTimerCallback):
     40        (WTR::TestRunner::platformInitialize):
     41        (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
     42        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
     43        (WTR::TestRunner::pathToLocalResource):
     44        (WTR::TestRunner::platformName):
     45        * WebKitTestRunner/InjectedBundle/mac/LayoutTestControllerMac.mm: Removed.
     46        * WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm: Copied from Tools/WebKitTestRunner/InjectedBundle/mac/LayoutTestControllerMac.mm.
     47        (WTR::TestRunner::platformInitialize):
     48        (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
     49        (WTR::waitUntilDoneWatchdogTimerFired):
     50        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
     51        (WTR::TestRunner::pathToLocalResource):
     52        (WTR::TestRunner::platformName):
     53        * WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp: Removed.
     54        * WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp.
     55        (WTR::WatchdogTimerHelper::timerFired):
     56        (WTR::TestRunner::platformInitialize):
     57        (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
     58        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
     59        (WTR::TestRunner::pathToLocalResource):
     60        (WTR::TestRunner::platformName):
     61        * WebKitTestRunner/InjectedBundle/win/LayoutTestControllerWin.cpp: Removed.
     62        * WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp: Copied from Tools/WebKitTestRunner/InjectedBundle/win/LayoutTestControllerWin.cpp.
     63        (WTR::TestRunner::platformInitialize):
     64        (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
     65        (WTR::waitToDumpWatchdogTimerFired):
     66        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
     67        (WTR::TestRunner::pathToLocalResource):
     68        (WTR::TestRunner::platformName):
     69        * WebKitTestRunner/PlatformEfl.cmake:
     70        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
     71        * WebKitTestRunner/win/InjectedBundle.vcproj:
     72
    1732012-08-15  Xianzhu Wang  <wangxianzhu@chromium.org>
    274

  • trunk/Tools/WebKitTestRunner/CMakeLists.txt

    r125467 r125732  
    5656    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/InjectedBundleMain.cpp
    5757    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/InjectedBundlePage.cpp
    58     ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/LayoutTestController.cpp
     58    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/TestRunner.cpp
    5959    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/TextInputController.cpp
    6060

  • trunk/Tools/WebKitTestRunner/DerivedSources.make

    r100488 r125732  
    3333    EventSendingController \
    3434    GCController \
    35     LayoutTestController \
     35    TestRunner \
    3636    TextInputController \
    3737#

  • trunk/Tools/WebKitTestRunner/GNUmakefile.am

    r123083 r125732  
    7373        DerivedSources/InjectedBundle/JSEventSendingController.cpp \
    7474        DerivedSources/InjectedBundle/JSGCController.cpp \
    75         DerivedSources/InjectedBundle/JSLayoutTestController.cpp \
     75        DerivedSources/InjectedBundle/JSTestRunner.cpp \
    7676        DerivedSources/InjectedBundle/JSTextInputController.cpp
    7777nodist_Libraries_libTestRunnerInjectedBundle_la_SOURCES = $(webkittestrunner_built_sources)
    … …  
    9999        Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp \
    100100        Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleGtk.cpp \
    101         Tools/WebKitTestRunner/InjectedBundle/gtk/LayoutTestControllerGtk.cpp \
     101        Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp \
    102102        Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp \
    103103        Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h \
    … …  
    105105        Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp \
    106106        Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h \
    107         Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp \
    108         Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h \
     107        Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp \
     108        Tools/WebKitTestRunner/InjectedBundle/TestRunner.h \
    109109        Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp \
    110110        Tools/WebKitTestRunner/InjectedBundle/TextInputController.h

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

    r125725 r125732  
    2626module WTR {
    2727
    28     interface LayoutTestController {
     28    interface TestRunner {
    2929        // The basics.
    3030        void dumpAsText(in boolean dumpPixels);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri

    r121777 r125732  
    1919    Bindings/EventSendingController.idl \
    2020    Bindings/GCController.idl \
    21     Bindings/LayoutTestController.idl \
     21    Bindings/TestRunner.idl \
    2222    Bindings/TextInputController.idl \
    2323

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

    r124163 r125732  
    170170    }
    171171    if (WKStringIsEqualToUTF8CString(messageName, "CallAddChromeInputFieldCallback")) {
    172         m_layoutTestController->callAddChromeInputFieldCallback();
     172        m_testRunner->callAddChromeInputFieldCallback();
    173173        return;
    174174    }
    175175    if (WKStringIsEqualToUTF8CString(messageName, "CallRemoveChromeInputFieldCallback")) {
    176         m_layoutTestController->callRemoveChromeInputFieldCallback();
     176        m_testRunner->callRemoveChromeInputFieldCallback();
    177177        return;
    178178    }
    179179    if (WKStringIsEqualToUTF8CString(messageName, "CallFocusWebViewCallback")) {
    180         m_layoutTestController->callFocusWebViewCallback();
     180        m_testRunner->callFocusWebViewCallback();
    181181        return;
    182182    }
    183183    if (WKStringIsEqualToUTF8CString(messageName, "CallSetBackingScaleFactorCallback")) {
    184         m_layoutTestController->callSetBackingScaleFactorCallback();
     184        m_testRunner->callSetBackingScaleFactorCallback();
    185185        return;
    186186    }
    … …  
    212212    m_stringBuilder->clear();
    213213
    214     m_layoutTestController = LayoutTestController::create();
     214    m_testRunner = TestRunner::create();
    215215    m_gcController = GCController::create();
    216216    m_eventSendingController = EventSendingController::create();
    … …  
    229229    WKBundleRemoveAllUserContent(m_bundle, m_pageGroup);
    230230
    231     m_layoutTestController->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
     231    m_testRunner->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
    232232
    233233    page()->prepare();

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h

    r120627 r125732  
    3030#include "EventSendingController.h"
    3131#include "GCController.h"
    32 #include "LayoutTestController.h"
     32#include "TestRunner.h"
    3333#include "TextInputController.h"
    3434#include <WebKit2/WKBase.h>
    … …  
    5858    WKBundlePageGroupRef pageGroup() const { return m_pageGroup; }
    5959
    60     LayoutTestController* layoutTestController() { return m_layoutTestController.get(); }
     60    TestRunner* testRunner() { return m_testRunner.get(); }
    6161    GCController* gcController() { return m_gcController.get(); }
    6262    EventSendingController* eventSendingController() { return m_eventSendingController.get(); }
    … …  
    116116
    117117    RefPtr<AccessibilityController> m_accessibilityController;
    118     RefPtr<LayoutTestController> m_layoutTestController;
     118    RefPtr<TestRunner> m_testRunner;
    119119    RefPtr<GCController> m_gcController;
    120120    RefPtr<EventSendingController> m_eventSendingController;

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r125700 r125732  
    712712        return;
    713713
    714     if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
     714    if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
    715715        dumpFrameDescriptionSuitableForTestResult(frame);
    716716        InjectedBundle::shared().stringBuilder()->append(" - didStartProvisionalLoadForFrame\n");
    … …  
    735735    InjectedBundle::shared().setTopLoadingFrame(0);
    736736
    737     if (InjectedBundle::shared().layoutTestController()->waitToDump())
     737    if (InjectedBundle::shared().testRunner()->waitToDump())
    738738        return;
    739739
    … …  
    746746        return;
    747747
    748     if (!InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks())
     748    if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
    749749        return;
    750750
    … …  
    758758        return;
    759759
    760     if (!InjectedBundle::shared().layoutTestController()->shouldDumpProgressFinishedCallback())
     760    if (!InjectedBundle::shared().testRunner()->shouldDumpProgressFinishedCallback())
    761761        return;
    762762
    … …  
    866866    ASSERT(InjectedBundle::shared().isTestRunning());
    867867
    868     InjectedBundle::shared().layoutTestController()->invalidateWaitToDumpWatchdogTimer();
     868    InjectedBundle::shared().testRunner()->invalidateWaitToDumpWatchdogTimer();
    869869
    870870    // Force a paint before dumping. This matches DumpRenderTree on Windows. (DumpRenderTree on Mac
    … …  
    875875    WTF::String url = toWTFString(adoptWK(WKURLCopyString(adoptWK(WKBundleFrameCopyURL(frame)).get())));
    876876    if (url.find("dumpAsText/") != WTF::notFound)
    877         InjectedBundle::shared().layoutTestController()->dumpAsText(false);
    878 
    879     switch (InjectedBundle::shared().layoutTestController()->whatToDump()) {
    880     case LayoutTestController::RenderTree: {
     877        InjectedBundle::shared().testRunner()->dumpAsText(false);
     878
     879    switch (InjectedBundle::shared().testRunner()->whatToDump()) {
     880    case TestRunner::RenderTree: {
    881881        WKRetainPtr<WKStringRef> text(AdoptWK, WKBundlePageCopyRenderTreeExternalRepresentation(m_page));
    882882        InjectedBundle::shared().stringBuilder()->append(toWTFString(text));
    883883        break;
    884884    }
    885     case LayoutTestController::MainFrameText:
     885    case TestRunner::MainFrameText:
    886886        dumpFrameText(WKBundlePageGetMainFrame(m_page));
    887887        break;
    888     case LayoutTestController::AllFramesText:
     888    case TestRunner::AllFramesText:
    889889        dumpAllFramesText();
    890890        break;
    891891    }
    892892
    893     if (InjectedBundle::shared().layoutTestController()->shouldDumpAllFrameScrollPositions())
     893    if (InjectedBundle::shared().testRunner()->shouldDumpAllFrameScrollPositions())
    894894        dumpAllFrameScrollPositions();
    895     else if (InjectedBundle::shared().layoutTestController()->shouldDumpMainFrameScrollPosition())
     895    else if (InjectedBundle::shared().testRunner()->shouldDumpMainFrameScrollPosition())
    896896        dumpFrameScrollPosition(WKBundlePageGetMainFrame(m_page));
    897897
    898     if (InjectedBundle::shared().layoutTestController()->shouldDumpBackForwardListsForAllWindows())
     898    if (InjectedBundle::shared().testRunner()->shouldDumpBackForwardListsForAllWindows())
    899899        InjectedBundle::shared().dumpBackForwardListsForAllPages();
    900900
    901     if (InjectedBundle::shared().shouldDumpPixels() && InjectedBundle::shared().layoutTestController()->shouldDumpPixels()) {
     901    if (InjectedBundle::shared().shouldDumpPixels() && InjectedBundle::shared().testRunner()->shouldDumpPixels()) {
    902902        InjectedBundle::shared().setPixelResult(adoptWK(WKBundlePageCreateSnapshotWithOptions(m_page, WKBundleFrameGetVisibleContentBounds(WKBundlePageGetMainFrame(m_page)), kWKSnapshotOptionsShareable | kWKSnapshotOptionsInViewCoordinates)).get());
    903903        if (WKBundlePageIsTrackingRepaints(m_page))
    … …  
    913913        return;
    914914
    915     if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
     915    if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
    916916        dumpFrameDescriptionSuitableForTestResult(frame);
    917917        InjectedBundle::shared().stringBuilder()->append(" - didFinishLoadForFrame\n");
    … …  
    922922    InjectedBundle::shared().setTopLoadingFrame(0);
    923923
    924     if (InjectedBundle::shared().layoutTestController()->waitToDump())
     924    if (InjectedBundle::shared().testRunner()->waitToDump())
    925925        return;
    926926
    … …  
    937937    InjectedBundle::shared().setTopLoadingFrame(0);
    938938
    939     if (InjectedBundle::shared().layoutTestController()->waitToDump())
     939    if (InjectedBundle::shared().testRunner()->waitToDump())
    940940        return;
    941941
    … …  
    948948        return;
    949949
    950     if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
     950    if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
    951951        dumpFrameDescriptionSuitableForTestResult(frame);
    952952        InjectedBundle::shared().stringBuilder()->append(" - didReceiveTitle: ");
    … …  
    955955    }
    956956
    957     if (!InjectedBundle::shared().layoutTestController()->shouldDumpTitleChanges())
     957    if (!InjectedBundle::shared().testRunner()->shouldDumpTitleChanges())
    958958        return;
    959959
    … …  
    972972
    973973    if (WKBundleScriptWorldNormalWorld() != world) {
    974         JSObjectSetProperty(context, window, toJS("__worldID").get(), JSValueMakeNumber(context, LayoutTestController::worldIDForWorld(world)), kJSPropertyAttributeReadOnly, 0);
     974        JSObjectSetProperty(context, window, toJS("__worldID").get(), JSValueMakeNumber(context, TestRunner::worldIDForWorld(world)), kJSPropertyAttributeReadOnly, 0);
    975975        return;
    976976    }
    977977
    978978    JSValueRef exception = 0;
    979     InjectedBundle::shared().layoutTestController()->makeWindowObject(context, window, &exception);
     979    InjectedBundle::shared().testRunner()->makeWindowObject(context, window, &exception);
    980980    InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
    981981    InjectedBundle::shared().eventSendingController()->makeWindowObject(context, window, &exception);
    … …  
    995995        return;
    996996
    997     if (!InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks())
     997    if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
    998998        return;
    999999
    … …  
    10071007        return;
    10081008
    1009     if (!InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks())
     1009    if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
    10101010        return;
    10111011
    … …  
    10251025        return;
    10261026
    1027     if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
     1027    if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
    10281028        dumpFrameDescriptionSuitableForTestResult(frame);
    10291029        InjectedBundle::shared().stringBuilder()->append(" - didFinishDocumentLoadForFrame\n");
    … …  
    10441044        return;
    10451045
    1046     if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameLoadCallbacks()) {
     1046    if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
    10471047        dumpFrameDescriptionSuitableForTestResult(frame);
    10481048        InjectedBundle::shared().stringBuilder()->append(" - didHandleOnloadEventsForFrame\n");
    … …  
    10671067        return;
    10681068
    1069     if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks())
     1069    if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
    10701070        return;
    10711071
    … …  
    10881088WKURLRequestRef InjectedBundlePage::willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef frame, uint64_t identifier, WKURLRequestRef request, WKURLResponseRef response)
    10891089{
    1090     if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().layoutTestController()->willSendRequestReturnsNull())
     1090    if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().testRunner()->willSendRequestReturnsNull())
    10911091        return 0;
    10921092
    10931093    if (InjectedBundle::shared().isTestRunning()
    1094         && InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks()) {
     1094        && InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
    10951095        InjectedBundle::shared().stringBuilder()->append(assignedUrlsCache.contains(identifier)
    10961096                                                         ? assignedUrlsCache.get(identifier)
    … …  
    11391139        return;
    11401140
    1141     if (InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks()) {
     1141    if (InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
    11421142        InjectedBundle::shared().stringBuilder()->append(assignedUrlsCache.contains(identifier)
    11431143                                                         ? assignedUrlsCache.get(identifier)
    … …  
    11491149
    11501150
    1151     if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceResponseMIMETypes())
     1151    if (!InjectedBundle::shared().testRunner()->shouldDumpResourceResponseMIMETypes())
    11521152        return;
    11531153
    … …  
    11711171        return;
    11721172
    1173     if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks())
     1173    if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
    11741174        return;
    11751175
    … …  
    11851185        return;
    11861186
    1187     if (!InjectedBundle::shared().layoutTestController()->shouldDumpResourceLoadCallbacks())
     1187    if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
    11881188        return;
    11891189
    … …  
    12251225        return WKBundlePagePolicyActionUse;
    12261226
    1227     if (!InjectedBundle::shared().layoutTestController()->isPolicyDelegateEnabled())
     1227    if (!InjectedBundle::shared().testRunner()->isPolicyDelegateEnabled())
    12281228        return WKBundlePagePolicyActionUse;
    12291229
    1230     if (InjectedBundle::shared().layoutTestController()->waitToDump()) {
     1230    if (InjectedBundle::shared().testRunner()->waitToDump()) {
    12311231        WKRetainPtr<WKStringRef> url = adoptWK(WKURLCopyString(WKURLRequestCopyURL(request)));
    12321232        InjectedBundle::shared().stringBuilder()->append("Policy delegate: attempt to load ");
    … …  
    12421242
    12431243        InjectedBundle::shared().stringBuilder()->append("\n");
    1244         InjectedBundle::shared().layoutTestController()->notifyDone();
    1245     }
    1246 
    1247     if (InjectedBundle::shared().layoutTestController()->isPolicyDelegatePermissive())
     1244        InjectedBundle::shared().testRunner()->notifyDone();
     1245    }
     1246
     1247    if (InjectedBundle::shared().testRunner()->isPolicyDelegatePermissive())
    12481248        return WKBundlePagePolicyActionUse;
    12491249    return WKBundlePagePolicyActionPassThrough;
    … …  
    13381338        return;
    13391339
    1340     if (!InjectedBundle::shared().layoutTestController()->shouldDumpStatusCallbacks())
     1340    if (!InjectedBundle::shared().testRunner()->shouldDumpStatusCallbacks())
    13411341        return;
    13421342
    … …  
    14371437        return true;
    14381438
    1439     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1439    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    14401440        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldBeginEditingInDOMRange:");
    14411441        InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), range));
    14421442        InjectedBundle::shared().stringBuilder()->append("\n");
    14431443    }
    1444     return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
     1444    return InjectedBundle::shared().testRunner()->shouldAllowEditing();
    14451445}
    14461446
    … …  
    14501450        return true;
    14511451
    1452     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1452    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    14531453        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldEndEditingInDOMRange:");
    14541454        InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), range));
    14551455        InjectedBundle::shared().stringBuilder()->append("\n");
    14561456    }
    1457     return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
     1457    return InjectedBundle::shared().testRunner()->shouldAllowEditing();
    14581458}
    14591459
    … …  
    14691469    };
    14701470
    1471     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1471    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    14721472        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldInsertNode:");
    14731473        InjectedBundle::shared().stringBuilder()->append(dumpPath(m_page, m_world.get(), node));
    … …  
    14781478        InjectedBundle::shared().stringBuilder()->append("\n");
    14791479    }
    1480     return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
     1480    return InjectedBundle::shared().testRunner()->shouldAllowEditing();
    14811481}
    14821482
    … …  
    14921492    };
    14931493
    1494     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1494    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    14951495        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldInsertText:");
    14961496        InjectedBundle::shared().stringBuilder()->append(toWTFString(text));
    … …  
    15011501        InjectedBundle::shared().stringBuilder()->append("\n");
    15021502    }
    1503     return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
     1503    return InjectedBundle::shared().testRunner()->shouldAllowEditing();
    15041504}
    15051505
    … …  
    15091509        return true;
    15101510
    1511     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1511    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    15121512        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldDeleteDOMRange:");
    15131513        InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), range));
    15141514        InjectedBundle::shared().stringBuilder()->append("\n");
    15151515    }
    1516     return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
     1516    return InjectedBundle::shared().testRunner()->shouldAllowEditing();
    15171517}
    15181518
    … …  
    15311531    };
    15321532
    1533     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1533    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    15341534        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldChangeSelectedDOMRange:");
    15351535        InjectedBundle::shared().stringBuilder()->append(rangeToStr(m_page, m_world.get(), fromRange));
    … …  
    15421542        InjectedBundle::shared().stringBuilder()->append("\n");
    15431543    }
    1544     return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
     1544    return InjectedBundle::shared().testRunner()->shouldAllowEditing();
    15451545}
    15461546
    … …  
    15501550        return true;
    15511551
    1552     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1552    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    15531553        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: shouldApplyStyle:");
    15541554        InjectedBundle::shared().stringBuilder()->append(styleDecToStr(style));
    … …  
    15571557        InjectedBundle::shared().stringBuilder()->append("\n");
    15581558    }
    1559     return InjectedBundle::shared().layoutTestController()->shouldAllowEditing();
     1559    return InjectedBundle::shared().testRunner()->shouldAllowEditing();
    15601560}
    15611561
    … …  
    15651565        return;
    15661566
    1567     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1567    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    15681568        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidBeginEditing:");
    15691569        InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
    … …  
    15771577        return;
    15781578
    1579     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1579    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    15801580        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidEndEditing:");
    15811581        InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
    … …  
    15891589        return;
    15901590
    1591     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1591    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    15921592        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidChange:");
    15931593        InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
    … …  
    16011601        return;
    16021602
    1603     if (InjectedBundle::shared().layoutTestController()->shouldDumpEditingCallbacks()) {
     1603    if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
    16041604        InjectedBundle::shared().stringBuilder()->append("EDITING DELEGATE: webViewDidChangeSelection:");
    16051605        InjectedBundle::shared().stringBuilder()->append(toWTFString(notificationName));
    … …  
    16111611bool InjectedBundlePage::supportsFullScreen(WKBundlePageRef pageRef, WKFullScreenKeyboardRequestType requestType)
    16121612{
    1613     if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
     1613    if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
    16141614        InjectedBundle::shared().stringBuilder()->append("supportsFullScreen() == true\n");
    16151615    return true;
    … …  
    16181618void InjectedBundlePage::enterFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
    16191619{
    1620     if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
     1620    if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
    16211621        InjectedBundle::shared().stringBuilder()->append("enterFullScreenForElement()\n");
    16221622
    1623     if (!InjectedBundle::shared().layoutTestController()->hasCustomFullScreenBehavior()) {
     1623    if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
    16241624        WKBundlePageWillEnterFullScreen(pageRef);
    16251625        WKBundlePageDidEnterFullScreen(pageRef);
    … …  
    16291629void InjectedBundlePage::exitFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
    16301630{
    1631     if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
     1631    if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
    16321632        InjectedBundle::shared().stringBuilder()->append("exitFullScreenForElement()\n");
    16331633
    1634     if (!InjectedBundle::shared().layoutTestController()->hasCustomFullScreenBehavior()) {
     1634    if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
    16351635        WKBundlePageWillExitFullScreen(pageRef);
    16361636        WKBundlePageDidExitFullScreen(pageRef);
    … …  
    16401640void InjectedBundlePage::beganEnterFullScreen(WKBundlePageRef, WKRect, WKRect)
    16411641{
    1642     if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
     1642    if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
    16431643        InjectedBundle::shared().stringBuilder()->append("beganEnterFullScreen()\n");
    16441644}
    … …  
    16461646void InjectedBundlePage::beganExitFullScreen(WKBundlePageRef, WKRect, WKRect)
    16471647{
    1648     if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
     1648    if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
    16491649        InjectedBundle::shared().stringBuilder()->append("beganExitFullScreen()\n");
    16501650}
    … …  
    16521652void InjectedBundlePage::closeFullScreen(WKBundlePageRef pageRef)
    16531653{
    1654     if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
     1654    if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
    16551655        InjectedBundle::shared().stringBuilder()->append("closeFullScreen()\n");
    16561656
    1657     if (!InjectedBundle::shared().layoutTestController()->hasCustomFullScreenBehavior()) {
     1657    if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
    16581658        WKBundlePageWillExitFullScreen(pageRef);
    16591659        WKBundlePageDidExitFullScreen(pageRef);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri

    r121851 r125732  
    2323    GCController.cpp \
    2424    GCController.h \
    25     LayoutTestController.cpp \
    26     LayoutTestController.h \
     25    TestRunner.cpp \
     26    TestRunner.h \
    2727    TextInputController.cpp \
    2828    TextInputController.h \
    … …  
    3030    qt/ActivateFontsQt.cpp \
    3131    qt/InjectedBundleQt.cpp \
    32     qt/LayoutTestControllerQt.cpp
     32    qt/TestRunnerQt.cpp
    3333
    3434# Adds the generated sources to SOURCES
    … …  
    4646    InjectedBundle.h \
    4747    InjectedBundlePage.h \
    48     LayoutTestController.h \
     48    TestRunner.h \
    4949    TextInputController.h \
    5050

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r125725 r125732  
    2525
    2626#include "config.h"
    27 #include "LayoutTestController.h"
     27#include "TestRunner.h"
    2828
    2929#include "InjectedBundle.h"
    3030#include "InjectedBundlePage.h"
    31 #include "JSLayoutTestController.h"
     31#include "JSTestRunner.h"
    3232#include "PlatformWebView.h"
    3333#include "StringFunctions.h"
    … …  
    5858// This is lower than DumpRenderTree's timeout, to make it easier to work through the failures
    5959// Eventually it should be changed to match.
    60 const double LayoutTestController::waitToDumpWatchdogTimerInterval = 6;
    61 
    62 PassRefPtr<LayoutTestController> LayoutTestController::create()
    63 {
    64     return adoptRef(new LayoutTestController);
    65 }
    66 
    67 LayoutTestController::LayoutTestController()
     60const double TestRunner::waitToDumpWatchdogTimerInterval = 6;
     61
     62PassRefPtr<TestRunner> TestRunner::create()
     63{
     64    return adoptRef(new TestRunner);
     65}
     66
     67TestRunner::TestRunner()
    6868    : m_whatToDump(RenderTree)
    6969    , m_shouldDumpAllFrameScrollPositions(false)
    … …  
    9494}
    9595
    96 LayoutTestController::~LayoutTestController()
    97 {
    98 }
    99 
    100 JSClassRef LayoutTestController::wrapperClass()
    101 {
    102     return JSLayoutTestController::layoutTestControllerClass();
    103 }
    104 
    105 void LayoutTestController::display()
     96TestRunner::~TestRunner()
     97{
     98}
     99
     100JSClassRef TestRunner::wrapperClass()
     101{
     102    return JSTestRunner::testRunnerClass();
     103}
     104
     105void TestRunner::display()
    106106{
    107107    WKBundlePageRef page = InjectedBundle::shared().page()->page();
    … …  
    111111}
    112112
    113 void LayoutTestController::dumpAsText(bool dumpPixels)
     113void TestRunner::dumpAsText(bool dumpPixels)
    114114{
    115115    if (m_whatToDump < MainFrameText)
    … …  
    119119
    120120// FIXME: Needs a full implementation see https://bugs.webkit.org/show_bug.cgi?id=42546
    121 void LayoutTestController::setCustomPolicyDelegate(bool enabled, bool permissive)
     121void TestRunner::setCustomPolicyDelegate(bool enabled, bool permissive)
    122122{
    123123    m_policyDelegateEnabled = enabled;
    … …  
    125125}
    126126
    127 void LayoutTestController::waitForPolicyDelegate()
     127void TestRunner::waitForPolicyDelegate()
    128128{
    129129    setCustomPolicyDelegate(true);
    … …  
    131131}
    132132
    133 void LayoutTestController::waitUntilDone()
     133void TestRunner::waitUntilDone()
    134134{
    135135    m_waitToDump = true;
    … …  
    138138}
    139139
    140 void LayoutTestController::waitToDumpWatchdogTimerFired()
     140void TestRunner::waitToDumpWatchdogTimerFired()
    141141{
    142142    invalidateWaitToDumpWatchdogTimer();
    … …  
    147147}
    148148
    149 void LayoutTestController::notifyDone()
     149void TestRunner::notifyDone()
    150150{
    151151    if (!InjectedBundle::shared().isTestRunning())
    … …  
    158158}
    159159
    160 unsigned LayoutTestController::numberOfActiveAnimations() const
     160unsigned TestRunner::numberOfActiveAnimations() const
    161161{
    162162    // FIXME: Is it OK this works only for the main frame?
    … …  
    166166}
    167167
    168 bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId)
     168bool TestRunner::pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId)
    169169{
    170170    // FIXME: Is it OK this works only for the main frame?
    … …  
    174174}
    175175
    176 bool LayoutTestController::pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId)
     176bool TestRunner::pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId)
    177177{
    178178    // FIXME: Is it OK this works only for the main frame?
    … …  
    182182}
    183183
    184 void LayoutTestController::suspendAnimations()
     184void TestRunner::suspendAnimations()
    185185{
    186186    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    … …  
    188188}
    189189
    190 JSRetainPtr<JSStringRef> LayoutTestController::layerTreeAsText() const
     190JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    191191{
    192192    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    … …  
    195195}
    196196
    197 void LayoutTestController::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
     197void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
    198198{
    199199    WKRetainPtr<WKStringRef> sourceWK = toWK(source);
    … …  
    205205}
    206206
    207 void LayoutTestController::addUserStyleSheet(JSStringRef source, bool allFrames)
     207void TestRunner::addUserStyleSheet(JSStringRef source, bool allFrames)
    208208{
    209209    WKRetainPtr<WKStringRef> sourceWK = toWK(source);
    … …  
    214214}
    215215
    216 void LayoutTestController::keepWebHistory()
     216void TestRunner::keepWebHistory()
    217217{
    218218    WKBundleSetShouldTrackVisitedLinks(InjectedBundle::shared().bundle(), true);
    219219}
    220220
    221 JSValueRef LayoutTestController::computedStyleIncludingVisitedInfo(JSValueRef element)
     221JSValueRef TestRunner::computedStyleIncludingVisitedInfo(JSValueRef element)
    222222{
    223223    // FIXME: Is it OK this works only for the main frame?
    … …  
    232232}
    233233
    234 JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSValueRef element)
     234JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSValueRef element)
    235235{
    236236    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    … …  
    244244}
    245245
    246 void LayoutTestController::execCommand(JSStringRef name, JSStringRef argument)
     246void TestRunner::execCommand(JSStringRef name, JSStringRef argument)
    247247{
    248248    WKBundlePageExecuteEditingCommand(InjectedBundle::shared().page()->page(), toWK(name).get(), toWK(argument).get());
    249249}
    250250
    251 bool LayoutTestController::findString(JSStringRef target, JSValueRef optionsArrayAsValue)
     251bool TestRunner::findString(JSStringRef target, JSValueRef optionsArrayAsValue)
    252252{
    253253    WKFindOptions options = 0;
    … …  
    287287}
    288288
    289 void LayoutTestController::clearAllDatabases()
     289void TestRunner::clearAllDatabases()
    290290{
    291291    WKBundleClearAllDatabases(InjectedBundle::shared().bundle());
    292292}
    293293
    294 void LayoutTestController::setDatabaseQuota(uint64_t quota)
     294void TestRunner::setDatabaseQuota(uint64_t quota)
    295295{
    296296    return WKBundleSetDatabaseQuota(InjectedBundle::shared().bundle(), quota);
    297297}
    298298
    299 void LayoutTestController::clearAllApplicationCaches()
     299void TestRunner::clearAllApplicationCaches()
    300300{
    301301    WKBundleClearApplicationCache(InjectedBundle::shared().bundle());
    302302}
    303303
    304 void LayoutTestController::setAppCacheMaximumSize(uint64_t size)
     304void TestRunner::setAppCacheMaximumSize(uint64_t size)
    305305{
    306306    WKBundleSetAppCacheMaximumSize(InjectedBundle::shared().bundle(), size);
    307307}
    308308
    309 bool LayoutTestController::isCommandEnabled(JSStringRef name)
     309bool TestRunner::isCommandEnabled(JSStringRef name)
    310310{
    311311    return WKBundlePageIsEditingCommandEnabled(InjectedBundle::shared().page()->page(), toWK(name).get());
    312312}
    313313
    314 void LayoutTestController::setCanOpenWindows(bool)
     314void TestRunner::setCanOpenWindows(bool)
    315315{
    316316    // It's not clear if or why any tests require opening windows be forbidden.
    … …  
    318318}
    319319
    320 void LayoutTestController::setXSSAuditorEnabled(bool enabled)
     320void TestRunner::setXSSAuditorEnabled(bool enabled)
    321321{
    322322    WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitXSSAuditorEnabled"));
    … …  
    324324}
    325325
    326 void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
     326void TestRunner::setAllowUniversalAccessFromFileURLs(bool enabled)
    327327{
    328328    WKBundleSetAllowUniversalAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    329329}
    330330
    331 void LayoutTestController::setAllowFileAccessFromFileURLs(bool enabled)
     331void TestRunner::setAllowFileAccessFromFileURLs(bool enabled)
    332332{
    333333    WKBundleSetAllowFileAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    334334}
    335335
    336 void LayoutTestController::setFrameFlatteningEnabled(bool enabled)
     336void TestRunner::setFrameFlatteningEnabled(bool enabled)
    337337{
    338338    WKBundleSetFrameFlatteningEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    339339}
    340340
    341 void LayoutTestController::setPluginsEnabled(bool enabled)
     341void TestRunner::setPluginsEnabled(bool enabled)
    342342{
    343343    WKBundleSetPluginsEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    344344}
    345345
    346 void LayoutTestController::setGeolocationPermission(bool enabled)
     346void TestRunner::setGeolocationPermission(bool enabled)
    347347{
    348348    WKBundleSetGeolocationPermission(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    349349}
    350350
    351 void LayoutTestController::setJavaScriptCanAccessClipboard(bool enabled)
     351void TestRunner::setJavaScriptCanAccessClipboard(bool enabled)
    352352{
    353353     WKBundleSetJavaScriptCanAccessClipboard(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    354354}
    355355
    356 void LayoutTestController::setPrivateBrowsingEnabled(bool enabled)
     356void TestRunner::setPrivateBrowsingEnabled(bool enabled)
    357357{
    358358     WKBundleSetPrivateBrowsingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    359359}
    360360
    361 void LayoutTestController::setPopupBlockingEnabled(bool enabled)
     361void TestRunner::setPopupBlockingEnabled(bool enabled)
    362362{
    363363     WKBundleSetPopupBlockingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    364364}
    365365
    366 void LayoutTestController::setAuthorAndUserStylesEnabled(bool enabled)
     366void TestRunner::setAuthorAndUserStylesEnabled(bool enabled)
    367367{
    368368     WKBundleSetAuthorAndUserStylesEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    369369}
    370370
    371 void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
     371void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
    372372{
    373373    WKBundleAddOriginAccessWhitelistEntry(InjectedBundle::shared().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
    374374}
    375375
    376 void LayoutTestController::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
     376void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
    377377{
    378378    WKBundleRemoveOriginAccessWhitelistEntry(InjectedBundle::shared().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
    379379}
    380380
    381 int LayoutTestController::numberOfPages(double pageWidthInPixels, double pageHeightInPixels)
     381int TestRunner::numberOfPages(double pageWidthInPixels, double pageHeightInPixels)
    382382{
    383383    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    … …  
    385385}
    386386
    387 JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
     387JSRetainPtr<JSStringRef> TestRunner::pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
    388388{
    389389    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    … …  
    391391}
    392392
    393 bool LayoutTestController::isPageBoxVisible(int pageIndex)
     393bool TestRunner::isPageBoxVisible(int pageIndex)
    394394{
    395395    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    … …  
    397397}
    398398
    399 void LayoutTestController::setValueForUser(JSContextRef context, JSValueRef element, JSStringRef value)
     399void TestRunner::setValueForUser(JSContextRef context, JSValueRef element, JSStringRef value)
    400400{
    401401    if (!element || !JSValueIsObject(context, element))
    … …  
    406406}
    407407
    408 unsigned LayoutTestController::windowCount()
     408unsigned TestRunner::windowCount()
    409409{
    410410    return InjectedBundle::shared().pageCount();
    411411}
    412412
    413 void LayoutTestController::clearBackForwardList()
     413void TestRunner::clearBackForwardList()
    414414{
    415415    WKBundleBackForwardListClear(WKBundlePageGetBackForwardList(InjectedBundle::shared().page()->page()));
    … …  
    418418// Object Creation
    419419
    420 void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
     420void TestRunner::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
    421421{
    422422    setProperty(context, windowObject, "testRunner", this, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
    423423}
    424424
    425 void LayoutTestController::showWebInspector()
     425void TestRunner::showWebInspector()
    426426{
    427427#if ENABLE(INSPECTOR)
    … …  
    430430}
    431431
    432 void LayoutTestController::closeWebInspector()
     432void TestRunner::closeWebInspector()
    433433{
    434434#if ENABLE(INSPECTOR)
    … …  
    437437}
    438438
    439 void LayoutTestController::evaluateInWebInspector(long callID, JSStringRef script)
     439void TestRunner::evaluateInWebInspector(long callID, JSStringRef script)
    440440{
    441441#if ENABLE(INSPECTOR)
    … …  
    452452}
    453453
    454 unsigned LayoutTestController::worldIDForWorld(WKBundleScriptWorldRef world)
     454unsigned TestRunner::worldIDForWorld(WKBundleScriptWorldRef world)
    455455{
    456456    WorldMap::const_iterator end = worldMap().end();
    … …  
    463463}
    464464
    465 void LayoutTestController::evaluateScriptInIsolatedWorld(JSContextRef context, unsigned worldID, JSStringRef script)
     465void TestRunner::evaluateScriptInIsolatedWorld(JSContextRef context, unsigned worldID, JSStringRef script)
    466466{
    467467    // A worldID of 0 always corresponds to a new world. Any other worldID corresponds to a world
    … …  
    485485}
    486486
    487 void LayoutTestController::setPOSIXLocale(JSStringRef locale)
     487void TestRunner::setPOSIXLocale(JSStringRef locale)
    488488{
    489489    char localeBuf[32];
    … …  
    492492}
    493493
    494 void LayoutTestController::setTextDirection(JSStringRef direction)
     494void TestRunner::setTextDirection(JSStringRef direction)
    495495{
    496496    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    … …  
    498498}
    499499   
    500 void LayoutTestController::setShouldStayOnPageAfterHandlingBeforeUnload(bool shouldStayOnPage)
     500void TestRunner::setShouldStayOnPageAfterHandlingBeforeUnload(bool shouldStayOnPage)
    501501{
    502502    InjectedBundle::shared().postNewBeforeUnloadReturnValue(!shouldStayOnPage);
    503503}
    504504
    505 void LayoutTestController::setDefersLoading(bool shouldDeferLoading)
     505void TestRunner::setDefersLoading(bool shouldDeferLoading)
    506506{
    507507    WKBundlePageSetDefersLoading(InjectedBundle::shared().page()->page(), shouldDeferLoading);
    508508}
    509509
    510 void LayoutTestController::setPageVisibility(JSStringRef state)
     510void TestRunner::setPageVisibility(JSStringRef state)
    511511{
    512512    WebCore::PageVisibilityState visibilityState = WebCore::PageVisibilityStateVisible;
    … …  
    522522}
    523523
    524 void LayoutTestController::resetPageVisibility()
     524void TestRunner::resetPageVisibility()
    525525{
    526526    WKBundleSetPageVisibilityState(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page(), WebCore::PageVisibilityStateVisible, /* isInitialState */ true);
    … …  
    541541};
    542542
    543 static void cacheLayoutTestControllerCallback(unsigned index, JSValueRef callback)
     543static void cacheTestRunnerCallback(unsigned index, JSValueRef callback)
    544544{
    545545    if (!callback)
    … …  
    552552}
    553553
    554 static void callLayoutTestControllerCallback(unsigned index)
     554static void callTestRunnerCallback(unsigned index)
    555555{
    556556    if (!callbackMap().contains(index))
    … …  
    563563}
    564564
    565 void LayoutTestController::addChromeInputField(JSValueRef callback)
    566 {
    567     cacheLayoutTestControllerCallback(AddChromeInputFieldCallbackID, callback);
     565void TestRunner::addChromeInputField(JSValueRef callback)
     566{
     567    cacheTestRunnerCallback(AddChromeInputFieldCallbackID, callback);
    568568    InjectedBundle::shared().postAddChromeInputField();
    569569}
    570570
    571 void LayoutTestController::removeChromeInputField(JSValueRef callback)
    572 {
    573     cacheLayoutTestControllerCallback(RemoveChromeInputFieldCallbackID, callback);
     571void TestRunner::removeChromeInputField(JSValueRef callback)
     572{
     573    cacheTestRunnerCallback(RemoveChromeInputFieldCallbackID, callback);
    574574    InjectedBundle::shared().postRemoveChromeInputField();
    575575}
    576576
    577 void LayoutTestController::focusWebView(JSValueRef callback)
    578 {
    579     cacheLayoutTestControllerCallback(FocusWebViewCallbackID, callback);
     577void TestRunner::focusWebView(JSValueRef callback)
     578{
     579    cacheTestRunnerCallback(FocusWebViewCallbackID, callback);
    580580    InjectedBundle::shared().postFocusWebView();
    581581}
    582582
    583 void LayoutTestController::setBackingScaleFactor(double backingScaleFactor, JSValueRef callback)
    584 {
    585     cacheLayoutTestControllerCallback(SetBackingScaleFactorCallbackID, callback);
     583void TestRunner::setBackingScaleFactor(double backingScaleFactor, JSValueRef callback)
     584{
     585    cacheTestRunnerCallback(SetBackingScaleFactorCallbackID, callback);
    586586    InjectedBundle::shared().postSetBackingScaleFactor(backingScaleFactor);
    587587}
    588588
    589 void LayoutTestController::setWindowIsKey(bool isKey)
     589void TestRunner::setWindowIsKey(bool isKey)
    590590{
    591591    InjectedBundle::shared().postSetWindowIsKey(isKey);
    592592}
    593593
    594 void LayoutTestController::callAddChromeInputFieldCallback()
    595 {
    596     callLayoutTestControllerCallback(AddChromeInputFieldCallbackID);
    597 }
    598 
    599 void LayoutTestController::callRemoveChromeInputFieldCallback()
    600 {
    601     callLayoutTestControllerCallback(RemoveChromeInputFieldCallbackID);
    602 }
    603 
    604 void LayoutTestController::callFocusWebViewCallback()
    605 {
    606     callLayoutTestControllerCallback(FocusWebViewCallbackID);
    607 }
    608 
    609 void LayoutTestController::callSetBackingScaleFactorCallback()
    610 {
    611     callLayoutTestControllerCallback(SetBackingScaleFactorCallbackID);
    612 }
    613 
    614 void LayoutTestController::overridePreference(JSStringRef preference, bool value)
     594void TestRunner::callAddChromeInputFieldCallback()
     595{
     596    callTestRunnerCallback(AddChromeInputFieldCallbackID);
     597}
     598
     599void TestRunner::callRemoveChromeInputFieldCallback()
     600{
     601    callTestRunnerCallback(RemoveChromeInputFieldCallbackID);
     602}
     603
     604void TestRunner::callFocusWebViewCallback()
     605{
     606    callTestRunnerCallback(FocusWebViewCallbackID);
     607}
     608
     609void TestRunner::callSetBackingScaleFactorCallback()
     610{
     611    callTestRunnerCallback(SetBackingScaleFactorCallbackID);
     612}
     613
     614void TestRunner::overridePreference(JSStringRef preference, bool value)
    615615{
    616616    WKBundleOverrideBoolPreferenceForTestRunner(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), toWK(preference).get(), value);
    617617}
    618618
    619 void LayoutTestController::sendWebIntentResponse(JSStringRef reply)
     619void TestRunner::sendWebIntentResponse(JSStringRef reply)
    620620{
    621621#if ENABLE(WEB_INTENTS)
    … …  
    638638}
    639639
    640 void LayoutTestController::deliverWebIntent(JSStringRef action, JSStringRef type, JSStringRef data)
     640void TestRunner::deliverWebIntent(JSStringRef action, JSStringRef type, JSStringRef data)
    641641{
    642642#if ENABLE(WEB_INTENTS)
    … …  
    658658}
    659659
    660 void LayoutTestController::setAlwaysAcceptCookies(bool accept)
     660void TestRunner::setAlwaysAcceptCookies(bool accept)
    661661{
    662662    WKBundleSetAlwaysAcceptCookies(InjectedBundle::shared().bundle(), accept);
    663663}
    664664
    665 double LayoutTestController::preciseTime()
     665double TestRunner::preciseTime()
    666666{
    667667    return currentTime();
    668668}
    669669
    670 void LayoutTestController::setUserStyleSheetEnabled(bool enabled)
     670void TestRunner::setUserStyleSheetEnabled(bool enabled)
    671671{
    672672    m_userStyleSheetEnabled = enabled;
    … …  
    677677}
    678678
    679 void LayoutTestController::setUserStyleSheetLocation(JSStringRef location)
     679void TestRunner::setUserStyleSheetLocation(JSStringRef location)
    680680{
    681681    m_userStyleSheetLocation = adoptWK(WKStringCreateWithJSString(location));

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r125725 r125732  
    2424 */
    2525
    26 #ifndef LayoutTestController_h
    27 #define LayoutTestController_h
     26#ifndef TestRunner_h
     27#define TestRunner_h
    2828
    2929#include "JSWrappable.h"
    … …  
    5252namespace WTR {
    5353
    54 class LayoutTestController : public JSWrappable {
     54class TestRunner : public JSWrappable {
    5555public:
    56     static PassRefPtr<LayoutTestController> create();
    57     virtual ~LayoutTestController();
     56    static PassRefPtr<TestRunner> create();
     57    virtual ~TestRunner();
    5858
    5959    // JSWrappable
    … …  
    233233    static const double waitToDumpWatchdogTimerInterval;
    234234
    235     LayoutTestController();
     235    TestRunner();
    236236
    237237    void platformInitialize();
    … …  
    274274} // namespace WTR
    275275
    276 #endif // LayoutTestController_h
     276#endif // TestRunner_h

  • trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp

    r125517 r125732  
    1919
    2020#include "config.h"
    21 #include "LayoutTestController.h"
     21#include "TestRunner.h"
    2222
    2323#include "InjectedBundle.h"
    … …  
    2828static Eina_Bool waitToDumpWatchdogTimerCallback(void*)
    2929{
    30     InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
     30    InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
    3131    return false;
    3232}
    3333
    34 void LayoutTestController::platformInitialize()
     34void TestRunner::platformInitialize()
    3535{
    3636    m_waitToDumpWatchdogTimer = 0;
    3737}
    3838
    39 void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
     39void TestRunner::invalidateWaitToDumpWatchdogTimer()
    4040{
    4141    if (!m_waitToDumpWatchdogTimer)
    … …  
    4646}
    4747
    48 void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
     48void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
    4949{
    5050    if (m_waitToDumpWatchdogTimer)
    … …  
    5555}
    5656
    57 JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
     57JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
    5858{
    5959    return url;
    6060}
    6161
    62 JSRetainPtr<JSStringRef> LayoutTestController::platformName()
     62JSRetainPtr<JSStringRef> TestRunner::platformName()
    6363{
    6464    JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("efl"));

  • trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp

    r125517 r125732  
    2626
    2727#include "config.h"
    28 #include "LayoutTestController.h"
     28#include "TestRunner.h"
    2929
    3030#include "InjectedBundle.h"
    … …  
    3535static gboolean waitToDumpWatchdogTimerCallback(gpointer)
    3636{
    37     InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
     37    InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
    3838    return FALSE;
    3939}
    4040
    41 void LayoutTestController::platformInitialize()
     41void TestRunner::platformInitialize()
    4242{
    4343    m_waitToDumpWatchdogTimer = 0;
    4444}
    4545
    46 void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
     46void TestRunner::invalidateWaitToDumpWatchdogTimer()
    4747{
    4848    if (!m_waitToDumpWatchdogTimer)
    … …  
    5252}
    5353
    54 void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
     54void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
    5555{
    5656    if (m_waitToDumpWatchdogTimer)
    … …  
    6161}
    6262
    63 JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
     63JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
    6464{
    6565    return url;
    6666}
    6767
    68 JSRetainPtr<JSStringRef> LayoutTestController::platformName()
     68JSRetainPtr<JSStringRef> TestRunner::platformName()
    6969{
    7070    JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("gtk"));

  • trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm

    r125517 r125732  
    2424 */
    2525
    26 #include "LayoutTestController.h"
     26#include "TestRunner.h"
    2727
    2828#include "InjectedBundle.h"
    … …  
    3030namespace WTR {
    3131
    32 void LayoutTestController::platformInitialize()
     32void TestRunner::platformInitialize()
    3333{
    3434}
    3535
    36 void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
     36void TestRunner::invalidateWaitToDumpWatchdogTimer()
    3737{
    3838    if (!m_waitToDumpWatchdogTimer)
    … …  
    4545static void waitUntilDoneWatchdogTimerFired(CFRunLoopTimerRef timer, void* info)
    4646{
    47     InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
     47    InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
    4848}
    4949
    50 void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
     50void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
    5151{
    5252    if (m_waitToDumpWatchdogTimer)
    … …  
    5757}
    5858
    59 JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
     59JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
    6060{
    6161    return JSStringRetain(url); // Do nothing on mac.
    6262}
    6363   
    64 JSRetainPtr<JSStringRef> LayoutTestController::platformName()
     64JSRetainPtr<JSStringRef> TestRunner::platformName()
    6565{
    6666    JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));

  • trunk/Tools/WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp

    r125725 r125732  
    2626
    2727#include "config.h"
    28 #include "LayoutTestController.h"
     28#include "TestRunner.h"
    2929
    3030#include "ActivateFonts.h"
    … …  
    5151    void timerFired()
    5252    {
    53         InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
     53        InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
    5454    }
    5555
    … …  
    5858};
    5959
    60 void LayoutTestController::platformInitialize()
     60void TestRunner::platformInitialize()
    6161{
    6262    // Make WebKit2 mimic the behaviour of DumpRenderTree, which is incorrect,
    … …  
    7070}
    7171
    72 void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
     72void TestRunner::invalidateWaitToDumpWatchdogTimer()
    7373{
    7474    m_waitToDumpWatchdogTimer.stop();
    7575}
    7676
    77 void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
     77void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
    7878{
    7979    if (qgetenv("QT_WEBKIT2_DEBUG") == "1")
    … …  
    8686}
    8787
    88 JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
     88JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
    8989{
    9090    QString localTmpUrl(QStringLiteral("file:///tmp/LayoutTests"));
    … …  
    105105}
    106106
    107 JSRetainPtr<JSStringRef> LayoutTestController::platformName()
     107JSRetainPtr<JSStringRef> TestRunner::platformName()
    108108{
    109109    JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("qt"));
    … …  
    113113} // namespace WTR
    114114
    115 #include "LayoutTestControllerQt.moc"
     115#include "TestRunnerQt.moc"

  • trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp

    r125517 r125732  
    2525
    2626#include "config.h"
    27 #include "LayoutTestController.h"
     27#include "TestRunner.h"
    2828
    2929#include "InjectedBundle.h"
    … …  
    3131namespace WTR {
    3232
    33 void LayoutTestController::platformInitialize()
     33void TestRunner::platformInitialize()
    3434{
    3535    m_waitToDumpWatchdogTimer = 0;
    3636}
    3737
    38 void LayoutTestController::invalidateWaitToDumpWatchdogTimer()
     38void TestRunner::invalidateWaitToDumpWatchdogTimer()
    3939{
    4040    if (!m_waitToDumpWatchdogTimer)
    … …  
    4747static void CALLBACK waitToDumpWatchdogTimerFired(HWND, UINT, UINT_PTR, DWORD)
    4848{
    49     InjectedBundle::shared().layoutTestController()->waitToDumpWatchdogTimerFired();
     49    InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
    5050}
    5151
    5252static const UINT_PTR waitToDumpWatchdogTimerIdentifier = 1;
    5353
    54 void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded()
     54void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
    5555{
    5656    if (m_waitToDumpWatchdogTimer)
    … …  
    6060}
    6161
    62 JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url)
     62JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
    6363{
    6464    return JSStringRetain(url); // TODO.
    6565}
    6666
    67 JSRetainPtr<JSStringRef> LayoutTestController::platformName()
     67JSRetainPtr<JSStringRef> TestRunner::platformName()
    6868{
    6969    JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));

  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r125467 r125732  
    5252    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp
    5353    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp
    54     ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/LayoutTestControllerEfl.cpp
     54    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/TestRunnerEfl.cpp
    5555)
    5656

  • trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj

    r112816 r125732  
    7272                BC9192051333E4F8003011DC /* TestInvocationCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9192041333E4F8003011DC /* TestInvocationCG.cpp */; };
    7373                BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952C0C11F3B965003398B4 /* JSWrapper.cpp */; };
    74                 BC952F1F11F3C652003398B4 /* JSLayoutTestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */; };
     74                BC952F1F11F3C652003398B4 /* JSTestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952F1D11F3C652003398B4 /* JSTestRunner.cpp */; };
    7575                BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */; };
    7676                BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */; };
    77                 BCC9981811D3F51E0017BCA2 /* LayoutTestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */; };
     77                BCC9981811D3F51E0017BCA2 /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
    7878                BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD7D2F711921278006DB7EE /* TestInvocation.cpp */; };
    7979                BCDA2B9A1191051F00C3BC47 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */; };
    80                 C0CE720B1247C93300BC0EC4 /* LayoutTestControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0CE720A1247C93300BC0EC4 /* LayoutTestControllerMac.mm */; };
     80                C0CE720B1247C93300BC0EC4 /* TestRunnerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */; };
    8181/* End PBXBuildFile section */
    8282
    … …  
    186186                BC952C0E11F3B97B003398B4 /* JSWrappable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWrappable.h; sourceTree = "<group>"; };
    187187                BC952EC511F3C10F003398B4 /* DerivedSources.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DerivedSources.make; sourceTree = "<group>"; };
    188                 BC952ED211F3C29F003398B4 /* LayoutTestController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LayoutTestController.idl; sourceTree = "<group>"; };
     188                BC952ED211F3C29F003398B4 /* TestRunner.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestRunner.idl; sourceTree = "<group>"; };
    189189                BC952ED311F3C318003398B4 /* CodeGeneratorTestRunner.pm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = CodeGeneratorTestRunner.pm; sourceTree = "<group>"; };
    190                 BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSLayoutTestController.cpp; path = DerivedSources/WebKitTestRunner/JSLayoutTestController.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    191                 BC952F1E11F3C652003398B4 /* JSLayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSLayoutTestController.h; path = DerivedSources/WebKitTestRunner/JSLayoutTestController.h; sourceTree = BUILT_PRODUCTS_DIR; };
     190                BC952F1D11F3C652003398B4 /* JSTestRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSTestRunner.cpp; path = DerivedSources/WebKitTestRunner/JSTestRunner.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
     191                BC952F1E11F3C652003398B4 /* JSTestRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSTestRunner.h; path = DerivedSources/WebKitTestRunner/JSTestRunner.h; sourceTree = BUILT_PRODUCTS_DIR; };
    192192                BC99A4841208901A007E9F08 /* StringFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringFunctions.h; sourceTree = "<group>"; };
    193193                BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundle.cpp; sourceTree = "<group>"; };
    … …  
    195195                BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePage.cpp; sourceTree = "<group>"; };
    196196                BCC997A311D3C8F60017BCA2 /* InjectedBundlePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePage.h; sourceTree = "<group>"; };
    197                 BCC9981611D3F51E0017BCA2 /* LayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutTestController.h; sourceTree = "<group>"; };
    198                 BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutTestController.cpp; sourceTree = "<group>"; };
     197                BCC9981611D3F51E0017BCA2 /* TestRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestRunner.h; sourceTree = "<group>"; };
     198                BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestRunner.cpp; sourceTree = "<group>"; };
    199199                BCD7D2F611921278006DB7EE /* TestInvocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestInvocation.h; sourceTree = "<group>"; };
    200200                BCD7D2F711921278006DB7EE /* TestInvocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestInvocation.cpp; sourceTree = "<group>"; };
    201201                BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    202                 C0CE720A1247C93300BC0EC4 /* LayoutTestControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LayoutTestControllerMac.mm; path = mac/LayoutTestControllerMac.mm; sourceTree = "<group>"; };
     202                C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestRunnerMac.mm; path = mac/TestRunnerMac.mm; sourceTree = "<group>"; };
    203203/* End PBXFileReference section */
    204204
    … …  
    325325                                BC14E4D9120E02D000826C0C /* GCController.cpp */,
    326326                                BC14E4D8120E02D000826C0C /* GCController.h */,
    327                                 BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */,
    328                                 BCC9981611D3F51E0017BCA2 /* LayoutTestController.h */,
    329                                 C0CE720A1247C93300BC0EC4 /* LayoutTestControllerMac.mm */,
     327                                BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */,
     328                                BCC9981611D3F51E0017BCA2 /* TestRunner.h */,
     329                                C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */,
    330330                                5664A49814326384008881BE /* TextInputController.cpp */,
    331331                                5664A49914326384008881BE /* TextInputController.h */,
    … …  
    413413                                BC8FD8CB120E52B000F3E71A /* EventSendingController.idl */,
    414414                                BC14E4E1120E032000826C0C /* GCController.idl */,
    415                                 BC952ED211F3C29F003398B4 /* LayoutTestController.idl */,
     415                                BC952ED211F3C29F003398B4 /* TestRunner.idl */,
    416416                                5664A49614326377008881BE /* TextInputController.idl */,
    417417                        );
    … …  
    434434                                BC14E4E8120E03D800826C0C /* JSGCController.cpp */,
    435435                                BC14E4E9120E03D800826C0C /* JSGCController.h */,
    436                                 BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */,
    437                                 BC952F1E11F3C652003398B4 /* JSLayoutTestController.h */,
     436                                BC952F1D11F3C652003398B4 /* JSTestRunner.cpp */,
     437                                BC952F1E11F3C652003398B4 /* JSTestRunner.h */,
    438438                                5641E2CE14335E95008307E5 /* JSTextInputController.cpp */,
    439439                                5641E2CF14335E95008307E5 /* JSTextInputController.h */,
    … …  
    578578                                BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */,
    579579                                BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */,
    580                                 BCC9981811D3F51E0017BCA2 /* LayoutTestController.cpp in Sources */,
     580                                BCC9981811D3F51E0017BCA2 /* TestRunner.cpp in Sources */,
    581581                                65EB85A011EC67CC0034D300 /* ActivateFonts.mm in Sources */,
    582582                                BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */,
    583                                 BC952F1F11F3C652003398B4 /* JSLayoutTestController.cpp in Sources */,
     583                                BC952F1F11F3C652003398B4 /* JSTestRunner.cpp in Sources */,
    584584                                BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */,
    585585                                BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */,
    … …  
    587587                                BC8FD8CA120E527F00F3E71A /* EventSendingController.cpp in Sources */,
    588588                                BC8FD8D2120E545B00F3E71A /* JSEventSendingController.cpp in Sources */,
    589                                 C0CE720B1247C93300BC0EC4 /* LayoutTestControllerMac.mm in Sources */,
     589                                C0CE720B1247C93300BC0EC4 /* TestRunnerMac.mm in Sources */,
    590590                                5664A49A14326384008881BE /* TextInputController.cpp in Sources */,
    591591                                5641E2D014335E95008307E5 /* JSTextInputController.cpp in Sources */,

  • trunk/Tools/WebKitTestRunner/win/InjectedBundle.vcproj

    r100488 r125732  
    719719                        </File>
    720720                        <File
    721                                 RelativePath="..\InjectedBundle\Bindings\LayoutTestController.idl"
     721                                RelativePath="..\InjectedBundle\Bindings\TestRunner.idl"
    722722                                >
    723723                                <FileConfiguration
    … …  
    875875                        </File>
    876876                        <File
    877                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.cpp"
    878                                 >
    879                         </File>
    880                         <File
    881                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.h"
     877                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTestRunner.cpp"
     878                                >
     879                        </File>
     880                        <File
     881                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTestRunner.h"
    882882                                >
    883883                        </File>
    … …  
    968968                </File>
    969969                <File
    970                         RelativePath="..\InjectedBundle\LayoutTestController.cpp"
    971                         >
    972                 </File>
    973                 <File
    974                         RelativePath="..\InjectedBundle\LayoutTestController.h"
    975                         >
    976                 </File>
    977                 <File
    978                         RelativePath="..\InjectedBundle\win\LayoutTestControllerWin.cpp"
     970                        RelativePath="..\InjectedBundle\TestRunner.cpp"
     971                        >
     972                </File>
     973                <File
     974                        RelativePath="..\InjectedBundle\TestRunner.h"
     975                        >
     976                </File>
     977                <File
     978                        RelativePath="..\InjectedBundle\win\TestRunnerWin.cpp"
    979979                        >
    980980                </File>
Note: See TracChangeset for help on using the changeset viewer.