Changeset 90085 in webkit


Ignore:
Timestamp:
Jun 29, 2011 8:40:01 PM (13 years ago)
Author:
yutak@chromium.org
Message:

2011-06-29 Yuta Kitamura <yutak@chromium.org>

Reviewed by Kent Tamura.

DRT: Make Hixie76WebSocketProtocolEnabled preference flag configurable from LayoutTestController
https://bugs.webkit.org/show_bug.cgi?id=63532

LayoutTestController::overridePreference() will be used to change the value of
the Hixie76WebSocketProtocolEnabled preference flag from layout tests. In this way,
we can avoid writing a lot of boilerplate code in each port's DumpRenderTree, but
at least we need to reset preference values in DumpRenderTree every time we start
a new test because preference values changed in some test should not be leaked
to the next test.

  • DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::overridePreference): The name of preference key is defined in WebKit/{mac/WebView,win}/WebPreferenceKeysPrivate.h.
  • DumpRenderTree/chromium/WebPreferences.cpp: (WebPreferences::reset): Set the default value. This will be called from TestShell::resetTestController(). (WebPreferences::applyTo):
  • DumpRenderTree/chromium/WebPreferences.h:
  • DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues): Set the default value.
  • DumpRenderTree/win/DumpRenderTree.cpp: (resetDefaultsToConsistentValues): Ditto.
Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r90083 r90085  
     12011-06-29  Yuta Kitamura  <yutak@chromium.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        DRT: Make Hixie76WebSocketProtocolEnabled preference flag configurable from LayoutTestController
     6        https://bugs.webkit.org/show_bug.cgi?id=63532
     7
     8        LayoutTestController::overridePreference() will be used to change the value of
     9        the Hixie76WebSocketProtocolEnabled preference flag from layout tests. In this way,
     10        we can avoid writing a lot of boilerplate code in each port's DumpRenderTree, but
     11        at least we need to reset preference values in DumpRenderTree every time we start
     12        a new test because preference values changed in some test should not be leaked
     13        to the next test.
     14
     15        * DumpRenderTree/chromium/LayoutTestController.cpp:
     16        (LayoutTestController::overridePreference):
     17        The name of preference key is defined in WebKit/{mac/WebView,win}/WebPreferenceKeysPrivate.h.
     18        * DumpRenderTree/chromium/WebPreferences.cpp:
     19        (WebPreferences::reset):
     20        Set the default value. This will be called from TestShell::resetTestController().
     21        (WebPreferences::applyTo):
     22        * DumpRenderTree/chromium/WebPreferences.h:
     23        * DumpRenderTree/mac/DumpRenderTree.mm:
     24        (resetDefaultsToConsistentValues): Set the default value.
     25        * DumpRenderTree/win/DumpRenderTree.cpp:
     26        (resetDefaultsToConsistentValues): Ditto.
     27
    1282011-06-29  Kenichi Ishibashi  <bashi@chromium.org>
    229
  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

    r89764 r90085  
    14261426    else if (key == "WebKitAllowRunningInsecureContent")
    14271427        prefs->allowRunningOfInsecureContent = cppVariantToBool(value);
     1428    else if (key == "WebKitHixie76WebSocketProtocolEnabled")
     1429        prefs->hixie76WebSocketProtocolEnabled = cppVariantToBool(value);
    14281430    else {
    14291431        string message("Invalid name for preference: ");
  • trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp

    r86201 r90085  
    111111    acceleratedDrawingEnabled = false;
    112112    forceCompositingMode = false;
     113    hixie76WebSocketProtocolEnabled = true;
    113114}
    114115
     
    163164    settings->setLegacyAccelerated2dCanvasEnabled(legacyAccelerated2dCanvasEnabled);
    164165    settings->setAcceleratedDrawingEnabled(acceleratedDrawingEnabled);
     166    settings->setHixie76WebSocketProtocolEnabled(hixie76WebSocketProtocolEnabled);
    165167
    166168    // Fixed values.
  • trunk/Tools/DumpRenderTree/chromium/WebPreferences.h

    r86201 r90085  
    8686    bool legacyAccelerated2dCanvasEnabled;
    8787    bool acceleratedDrawingEnabled;
     88    bool hixie76WebSocketProtocolEnabled;
    8889
    8990    WebPreferences() { reset(); }
  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r89733 r90085  
    478478    [preferences setUsePreHTML5ParserQuirks:NO];
    479479    [preferences setAsynchronousSpellCheckingEnabled:NO];
     480    [preferences setHixie76WebSocketProtocolEnabled:YES];
    480481
    481482    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
  • trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

    r83656 r90085  
    878878        prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
    879879        prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);
     880        prefsPrivate->setHixie76WebSocketProtocolEnabled(TRUE);
    880881    }
    881882    setAlwaysAcceptCookies(false);
Note: See TracChangeset for help on using the changeset viewer.