Tools/ChangeLog

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

        Reviewed by NOBODY (OOPS!).

        [Chromium] DRT: Add setHixie76WebSocketProtocolEnabled to LayoutTestController

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

        Add a method to LayoutTestController so we can switch WebSocket protocols in layout tests.

        * DumpRenderTree/chromium/LayoutTestController.cpp:

        (LayoutTestController::LayoutTestController):

        (LayoutTestController::setHixie76WebSocketProtocolEnabled):

        * DumpRenderTree/chromium/LayoutTestController.h:

        * DumpRenderTree/chromium/WebPreferences.cpp:

        (WebPreferences::reset):

        (WebPreferences::applyTo):

        * DumpRenderTree/chromium/WebPreferences.h:

2011-06-27  Alice Boxhall  <aboxhall@chromium.org>

        Reviewed by Ojan Vafai.

Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@LayoutTestController::LayoutTestController(TestShell* shell)

    bindMethod("setTextDirection", &LayoutTestController::setTextDirection);

    bindMethod("setImagesAllowed", &LayoutTestController::setImagesAllowed);

    bindMethod("setStorageAllowed", &LayoutTestController::setStorageAllowed);

195 bindMethod("setHixie76WebSocketProtocolEnabled", &LayoutTestController::setHixie76WebSocketProtocolEnabled);

    // The following are stubs.

    bindMethod("abortModal", &LayoutTestController::abortModal);

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

    m_encodedAudioData = arguments[0].toString();

    setShouldDumpAsAudio(true);

}

void LayoutTestController::setHixie76WebSocketProtocolEnabled(const CppArgumentList& arguments, CppVariant* result)

{

    if (arguments.size() > 0 && arguments[0].isBool()) {

        m_shell->preferences()->hixie76WebSocketProtocolEnabled = arguments[0].toBoolean();

        m_shell->applyPreferences();

    }

    result->setNull();

}

Tools/DumpRenderTree/chromium/LayoutTestController.h

@@public:

    // Changes the direction of the focused element.

    void setTextDirection(const CppArgumentList&, CppVariant*);

    // Switch WebSocket protocols.

    void setHixie76WebSocketProtocolEnabled(const CppArgumentList&, CppVariant*);

public:

    // The following methods are not exposed to JavaScript.

    void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }

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);

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

    settings->setFullScreenEnabled(true);

    settings->setValidationMessageTimerMagnification(-1);

}

182

Tools/DumpRenderTree/chromium/WebPreferences.h

@@struct WebPreferences {

    bool accelerated2dCanvasEnabled;

    bool legacyAccelerated2dCanvasEnabled;

    bool acceleratedDrawingEnabled;

88 bool hixie76WebSocketProtocolEnabled;

    WebPreferences() { reset(); }

    void reset();