Changeset 56566 in webkit


Ignore:
Timestamp:
Mar 25, 2010 1:20:37 PM (14 years ago)
Author:
yurys@chromium.org
Message:

2010-03-25 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Allow running tests with enabled developer extras and closed Web Inspector. Tests that have inspector-enabled/ in their path/url will have developer extras enabled.

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

  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/gtk/DumpRenderTree.cpp: (shouldEnableDeveloperExtras): (runTest):
  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: (LayoutTestController::setJavaScriptProfilingEnabled): (LayoutTestController::setDeveloperExtrasEnabled): (LayoutTestController::showWebInspector): (LayoutTestController::closeWebInspector):
  • DumpRenderTree/mac/DumpRenderTree.mm: (shouldEnableDeveloperExtras): (runTest):
  • DumpRenderTree/mac/LayoutTestControllerMac.mm: (LayoutTestController::setJavaScriptProfilingEnabled): (LayoutTestController::setDeveloperExtrasEnabled): (LayoutTestController::showWebInspector): (LayoutTestController::closeWebInspector):
  • DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::shouldEnableDeveloperExtras): (WebCore::DumpRenderTree::open):
  • DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::closeWebInspector): (LayoutTestController::setDeveloperExtrasEnabled): (LayoutTestController::showWebInspector): (LayoutTestController::setJavaScriptProfilingEnabled):
  • DumpRenderTree/win/DumpRenderTree.cpp: (shouldEnableDeveloperExtras): (runTest):
  • DumpRenderTree/win/LayoutTestControllerWin.cpp: (LayoutTestController::setJavaScriptProfilingEnabled): (LayoutTestController::setDeveloperExtrasEnabled): (LayoutTestController::showWebInspector): (LayoutTestController::closeWebInspector):
Location:
trunk/WebKitTools
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r56554 r56566  
     12010-03-25  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Allow running tests with enabled developer extras and closed Web Inspector. Tests that have inspector-enabled/ in their path/url will have developer extras enabled.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=36610
     8
     9        * DumpRenderTree/LayoutTestController.h:
     10        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     11        (shouldEnableDeveloperExtras):
     12        (runTest):
     13        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     14        (LayoutTestController::setJavaScriptProfilingEnabled):
     15        (LayoutTestController::setDeveloperExtrasEnabled):
     16        (LayoutTestController::showWebInspector):
     17        (LayoutTestController::closeWebInspector):
     18        * DumpRenderTree/mac/DumpRenderTree.mm:
     19        (shouldEnableDeveloperExtras):
     20        (runTest):
     21        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     22        (LayoutTestController::setJavaScriptProfilingEnabled):
     23        (LayoutTestController::setDeveloperExtrasEnabled):
     24        (LayoutTestController::showWebInspector):
     25        (LayoutTestController::closeWebInspector):
     26        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     27        (WebCore::shouldEnableDeveloperExtras):
     28        (WebCore::DumpRenderTree::open):
     29        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     30        (LayoutTestController::closeWebInspector):
     31        (LayoutTestController::setDeveloperExtrasEnabled):
     32        (LayoutTestController::showWebInspector):
     33        (LayoutTestController::setJavaScriptProfilingEnabled):
     34        * DumpRenderTree/win/DumpRenderTree.cpp:
     35        (shouldEnableDeveloperExtras):
     36        (runTest):
     37        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     38        (LayoutTestController::setJavaScriptProfilingEnabled):
     39        (LayoutTestController::setDeveloperExtrasEnabled):
     40        (LayoutTestController::showWebInspector):
     41        (LayoutTestController::closeWebInspector):
     42
    1432010-03-25  Adam Barth  <abarth@webkit.org>
    244

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.h

    r55893 r56566  
    232232    bool geolocationPermission() const { return m_geolocationPermission; }
    233233
     234    void setDeveloperExtrasEnabled(bool);
    234235    void showWebInspector();
    235236    void closeWebInspector();

  • trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r56157 r56566  
    118118}
    119119
     120static bool shouldEnableDeveloperExtras(const char* pathOrURL)
     121{
     122    return shouldOpenWebInspector(pathOrURL) || strstr(pathOrURL, "inspector-enabled/");
     123}
     124
    120125void dumpFrameScrollPosition(WebKitWebFrame* frame)
    121126{
    … …  
    480485        gLayoutTestController->setDumpFrameLoadCallbacks(true);
    481486
    482     if (shouldOpenWebInspector(pathOrURL.c_str()))
    483         gLayoutTestController->showWebInspector();
     487    if (shouldEnableDeveloperExtras(pathOrURL.c_str())) {
     488        gLayoutTestController->setDeveloperExtrasEnabled(true);
     489        if (shouldOpenWebInspector(pathOrURL.c_str()))
     490            gLayoutTestController->showWebInspector();
     491    }
    484492
    485493    WorkQueue::shared()->clear();
    … …  
    514522    gtk_main();
    515523
    516     if (shouldOpenWebInspector(pathOrURL.c_str()))
     524    // If developer extras enabled Web Inspector may have been open by the test.
     525    if (shouldEnableDeveloperExtras(pathOrURL.c_str()))
    517526        gLayoutTestController->closeWebInspector();
    518527

  • trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r56262 r56566  
    412412    ASSERT(view);
    413413
    414     WebKitWebSettings* settings = webkit_web_view_get_settings(view);
    415     g_object_set(G_OBJECT(settings), "enable-developer-extras", flag, NULL);
     414    setDeveloperExtrasEnabled(flag);
    416415
    417416    WebKitWebInspector* inspector = webkit_web_view_get_inspector(view);
    … …  
    578577}
    579578
     579void LayoutTestController::setDeveloperExtrasEnabled(bool enabled)
     580{
     581    WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
     582    WebKitWebSettings* webSettings = webkit_web_view_get_settings(webView);
     583
     584    g_object_set(webSettings, "enable-developer-extras", enabled, NULL);
     585}
     586
    580587void LayoutTestController::showWebInspector()
    581588{
    582589    WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
    583     WebKitWebSettings* webSettings = webkit_web_view_get_settings(webView);
    584590    WebKitWebInspector* inspector = webkit_web_view_get_inspector(webView);
    585591
    586     g_object_set(webSettings, "enable-developer-extras", TRUE, NULL);
    587592    webkit_web_inspector_show(inspector);
    588593}
    … …  
    591596{
    592597    WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
    593     WebKitWebSettings* webSettings = webkit_web_view_get_settings(webView);
    594598    WebKitWebInspector* inspector = webkit_web_view_get_inspector(webView);
    595599
    596600    webkit_web_inspector_close(inspector);
    597     g_object_set(webSettings, "enable-developer-extras", FALSE, NULL);
    598601}
    599602

  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

    r55867 r56566  
    11341134}
    11351135
     1136static bool shouldEnableDeveloperExtras(const char* pathOrURL)
     1137{
     1138    return shouldOpenWebInspector(pathOrURL) || strstr(pathOrURL, "inspector-enabled/");
     1139}
     1140
    11361141static void resetWebViewToConsistentStateBeforeTesting()
    11371142{
    … …  
    12121217        [[mainFrame webView] setHistoryDelegate:nil];
    12131218
    1214     if (shouldOpenWebInspector(pathOrURL.c_str()))
    1215         gLayoutTestController->showWebInspector();
     1219    if (shouldEnableDeveloperExtras(pathOrURL.c_str())) {
     1220        gLayoutTestController->setDeveloperExtrasEnabled(true);
     1221        if (shouldOpenWebInspector(pathOrURL.c_str()))
     1222            gLayoutTestController->showWebInspector();
     1223    }
    12161224
    12171225    if ([WebHistory optionalSharedHistory])
    … …  
    12641272    }
    12651273
    1266     if (shouldOpenWebInspector(pathOrURL.c_str()))
     1274    // If developer extras enabled Web Inspector may have been open by the test.
     1275    if (shouldEnableDeveloperExtras(pathOrURL.c_str()))
    12671276        gLayoutTestController->closeWebInspector();
    12681277

  • trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r56262 r56566  
    303303void LayoutTestController::setJavaScriptProfilingEnabled(bool profilingEnabled)
    304304{
    305     [[[mainFrame webView] preferences] setDeveloperExtrasEnabled:profilingEnabled];
     305    setDeveloperExtrasEnabled(profilingEnabled);
    306306    [[[mainFrame webView] inspector] setJavaScriptProfilingEnabled:profilingEnabled];
    307307}
    … …  
    572572}
    573573
     574void LayoutTestController::setDeveloperExtrasEnabled(bool enabled)
     575{
     576    [[[mainFrame webView] preferences] setDeveloperExtrasEnabled:enabled];
     577}
     578
    574579void LayoutTestController::showWebInspector()
    575580{
    576     [[[mainFrame webView] preferences] setDeveloperExtrasEnabled:true];
    577581    [[[mainFrame webView] inspector] show:nil];
    578582}
    … …  
    581585{
    582586    [[[mainFrame webView] inspector] close:nil];
    583     [[[mainFrame webView] preferences] setDeveloperExtrasEnabled:false];
    584587}
    585588

  • trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r56547 r56566  
    456456}
    457457
     458static bool shouldEnableDeveloperExtras(const QUrl& url)
     459{
     460    return isWebInspectorTest(url) || url.path().contains("inspector-enabled/");
     461}
     462
    458463void DumpRenderTree::open(const QUrl& url)
    459464{
    460465    resetToConsistentStateBeforeTesting();
    461466
    462     if (isWebInspectorTest(m_page->mainFrame()->url()))
     467    if (shouldEnableDeveloperExtras(m_page->mainFrame()->url())) {
    463468        layoutTestController()->closeWebInspector();
    464 
    465     if (isWebInspectorTest(url))
    466         layoutTestController()->showWebInspector();
     469        layoutTestController()->setDeveloperExtrasEnabled(false);
     470    }
     471
     472    if (shouldEnableDeveloperExtras(url)) {
     473        layoutTestController()->setDeveloperExtrasEnabled(true);
     474        if (isWebInspectorTest(url))
     475            layoutTestController()->showWebInspector();
     476    }
    467477
    468478    // W3C SVG tests expect to be 480x360

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r56456 r56566  
    301301{
    302302    qt_drt_webinspector_close(m_drt->webPage());
    303     m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false);
     303}
     304
     305void LayoutTestController::setDeveloperExtrasEnabled(bool enabled)
     306{
     307    m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, enabled);
    304308}
    305309
    306310void LayoutTestController::showWebInspector()
    307311{
    308     m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
    309312    qt_drt_webinspector_show(m_drt->webPage());
    310313}
    … …  
    337340void LayoutTestController::setJavaScriptProfilingEnabled(bool enable)
    338341{
    339     m_topLoadingFrame->page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
     342    setDeveloperExtrasEnabled(enable);
    340343    qt_drt_setJavaScriptProfilingEnabled(m_topLoadingFrame, enable);
    341344}

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r56211 r56566  
    118118    QString decodeHostName(const QString& host);
    119119    void dumpSelectionRect() const {}
     120    void setDeveloperExtrasEnabled(bool);
    120121    void showWebInspector();
    121122    void closeWebInspector();

  • trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

    r55481 r56566  
    733733}
    734734
     735static bool shouldEnableDeveloperExtras(const char* pathOrURL)
     736{
     737    return shouldOpenWebInspector(pathOrURL) || strstr(pathOrURL, "/inspector-enabled/") || strstr(pathOrURL, "\\inspector-enabled\\");
     738}
     739
    735740static void resetDefaultsToConsistentValues(IWebPreferences* preferences)
    736741{
    … …  
    912917    resetWebViewToConsistentStateBeforeTesting();
    913918
    914     if (shouldOpenWebInspector(pathOrURL.c_str()))
    915         gLayoutTestController->showWebInspector();
     919    if (shouldEnableDeveloperExtras(pathOrURL.c_str())) {
     920        gLayoutTestController->setDeveloperExtrasEnabled(true);
     921        if (shouldOpenWebInspector(pathOrURL.c_str()))
     922            gLayoutTestController->showWebInspector();
     923    }
    916924
    917925    prevTestBFItem = 0;
    … …  
    949957    }
    950958
    951     if (shouldOpenWebInspector(pathOrURL.c_str()))
     959    if (shouldEnableDeveloperExtras(pathOrURL.c_str()))
    952960        gLayoutTestController->closeWebInspector();
    953961

  • trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r56262 r56566  
    694694        return;
    695695
    696     COMPtr<IWebPreferences> preferences;
    697     if (FAILED(webView->preferences(&preferences)))
    698         return;
    699 
    700     COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
    701     if (!prefsPrivate)
    702         return;
    703 
    704696    COMPtr<IWebInspector> inspector;
    705697    if (FAILED(viewPrivate->inspector(&inspector)))
    706698        return;
    707699
    708     prefsPrivate->setDeveloperExtrasEnabled(flag);
     700    setDeveloperExtrasEnabled(flag);
    709701    inspector->setJavaScriptProfilingEnabled(flag);
    710702}
    … …  
    992984}
    993985
    994 void LayoutTestController::showWebInspector()
     986void LayoutTestController::setDeveloperExtrasEnabled(bool enabled)
    995987{
    996988    COMPtr<IWebView> webView;
    … …  
    1006998        return;
    1007999
    1008     prefsPrivate->setDeveloperExtrasEnabled(true);
     1000    prefsPrivate->setDeveloperExtrasEnabled(enabled);
     1001}
     1002
     1003void LayoutTestController::showWebInspector()
     1004{
     1005    COMPtr<IWebView> webView;
     1006    if (FAILED(frame->webView(&webView)))
     1007        return;
    10091008
    10101009    COMPtr<IWebViewPrivate> viewPrivate(Query, webView);
    … …  
    10321031
    10331032    inspector->close();
    1034 
    1035     COMPtr<IWebPreferences> preferences;
    1036     if (FAILED(webView->preferences(&preferences)))
    1037         return;
    1038 
    1039     COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
    1040     if (!prefsPrivate)
    1041         return;
    1042 
    1043     prefsPrivate->setDeveloperExtrasEnabled(false);
    10441033}
    10451034
Note: See TracChangeset for help on using the changeset viewer.