Tools/ChangeLog

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

        Reviewed by NOBODY (OOPS!).

        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.

2011-06-28  Ryosuke Niwa  <rniwa@webkit.org>

        Reviewed by Adam Roben.

Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@void LayoutTestController::overridePreference(const CppArgumentList& arguments,

        prefs->allowDisplayOfInsecureContent = cppVariantToBool(value);

    else if (key == "WebKitAllowRunningInsecureContent")

        prefs->allowRunningOfInsecureContent = cppVariantToBool(value);

1428 else if (key == "WebKitHixie76WebSocketProtocolEnabled")

1429 prefs->hixie76WebSocketProtocolEnabled = cppVariantToBool(value);

    else {

        string message("Invalid name for preference: ");

        message.append(key);

Tools/DumpRenderTree/chromium/WebPreferences.cpp

@@void WebPreferences::reset()

    legacyAccelerated2dCanvasEnabled = false;

    acceleratedDrawingEnabled = false;

    forceCompositingMode = false;

113 hixie76WebSocketProtocolEnabled = true;

}

void WebPreferences::applyTo(WebView* webView)

@@void WebPreferences::applyTo(WebView* webView)

    settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);

    settings->setLegacyAccelerated2dCanvasEnabled(legacyAccelerated2dCanvasEnabled);

    settings->setAcceleratedDrawingEnabled(acceleratedDrawingEnabled);

166 settings->setHixie76WebSocketProtocolEnabled(hixie76WebSocketProtocolEnabled);

    // Fixed values.

    settings->setShouldPaintCustomScrollbars(true);

Tools/DumpRenderTree/chromium/WebPreferences.h

@@struct WebPreferences {

    bool accelerated2dCanvasEnabled;

    bool legacyAccelerated2dCanvasEnabled;

    bool acceleratedDrawingEnabled;

88 bool hixie76WebSocketProtocolEnabled;

    WebPreferences() { reset(); }

    void reset();

Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@static void resetDefaultsToConsistentValues()

    [preferences setWebGLEnabled:NO];

    [preferences setUsePreHTML5ParserQuirks:NO];

    [preferences setAsynchronousSpellCheckingEnabled:NO];

480 [preferences setHixie76WebSocketProtocolEnabled:YES];

    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];

    

Tools/DumpRenderTree/win/DumpRenderTree.cpp

@@static void resetDefaultsToConsistentValues(IWebPreferences* preferences)

        prefsPrivate->setFrameFlatteningEnabled(FALSE);

        prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);

        prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);

880 prefsPrivate->setHixie76WebSocketProtocolEnabled(TRUE);

    }

    setAlwaysAcceptCookies(false);