Remove LayoutTestController and WebKitTestRunner support for Hixie76 WebSockets
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Jul 2012 20:39:46 +0000 (20:39 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Jul 2012 20:39:46 +0000 (20:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=90853

Reviewed by Eric Seidel.

Tools:

WebKit no longer implements the Hixie76 version of the WebSocket
protocol. We don't need to support it in our test framework.

* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::overridePreference):
* DumpRenderTree/chromium/WebPreferences.cpp:
(WebPreferences::reset):
(WebPreferences::applyTo):
* DumpRenderTree/chromium/WebPreferences.h:
(WebPreferences):
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::overridePreference):
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues):
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::WebPage::resetSettings):
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::overridePreference):
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):

LayoutTests:

There's no need to explicitly disable the Hixie76 protocol because it
no longer exists in WebKit.

* http/tests/websocket/tests/hybi/alert-in-event-handler.html:
* http/tests/websocket/tests/hybi/bad-handshake-crash.html:
* http/tests/websocket/tests/hybi/bad-sub-protocol-control-chars.html:
* http/tests/websocket/tests/hybi/bad-sub-protocol-empty.html:
* http/tests/websocket/tests/hybi/bad-sub-protocol-non-ascii.html:
* http/tests/websocket/tests/hybi/binary-type.html:
* http/tests/websocket/tests/hybi/broken-utf8.html:
* http/tests/websocket/tests/hybi/bufferedAmount-after-close-in-busy.html:
* http/tests/websocket/tests/hybi/bufferedAmount-after-close.html:
* http/tests/websocket/tests/hybi/client-close.html:
* http/tests/websocket/tests/hybi/close-before-open.html:
* http/tests/websocket/tests/hybi/close-code-and-reason.html:
* http/tests/websocket/tests/hybi/close-event.html:
* http/tests/websocket/tests/hybi/close-on-navigate-new-location.html:
* http/tests/websocket/tests/hybi/close-on-unload-and-force-gc.html:
* http/tests/websocket/tests/hybi/close-on-unload-reference-in-parent.html:
* http/tests/websocket/tests/hybi/close-on-unload.html:
* http/tests/websocket/tests/hybi/close-unref-websocket.html:
* http/tests/websocket/tests/hybi/close.html:
* http/tests/websocket/tests/hybi/compressed-control-frame.html:
* http/tests/websocket/tests/hybi/cross-origin.html:
* http/tests/websocket/tests/hybi/deflate-frame-comp-bit-onoff.html:
* http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html:
* http/tests/websocket/tests/hybi/deflate-frame-parameter.html:
* http/tests/websocket/tests/hybi/echo-with-no-extension.html:
* http/tests/websocket/tests/hybi/extensions.html:
* http/tests/websocket/tests/hybi/fragmented-binary-frames.html:
* http/tests/websocket/tests/hybi/fragmented-control-frame.html:
* http/tests/websocket/tests/hybi/fragmented-frames.html:
* http/tests/websocket/tests/hybi/frame-lengths.html:
* http/tests/websocket/tests/hybi/handshake-challenge-randomness.html:
* http/tests/websocket/tests/hybi/handshake-error.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-maxlength.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-mismatch-protocol-header.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-more-accept-header.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-more-protocol-header.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-no-cr.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null.html:
* http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header.html:
* http/tests/websocket/tests/hybi/httponly-cookie.pl:
* http/tests/websocket/tests/hybi/interleaved-fragments.html:
* http/tests/websocket/tests/hybi/invalid-continuation.html:
* http/tests/websocket/tests/hybi/invalid-encode-length.html:
* http/tests/websocket/tests/hybi/invalid-masked-frames-from-server.html:
* http/tests/websocket/tests/hybi/invalid-subprotocol-characters.html:
* http/tests/websocket/tests/hybi/invalid-subprotocols.html:
* http/tests/websocket/tests/hybi/long-control-frame.html:
* http/tests/websocket/tests/hybi/long-invalid-header.html:
* http/tests/websocket/tests/hybi/multiple-connections.html:
* http/tests/websocket/tests/hybi/multiple-subprotocols.html:
* http/tests/websocket/tests/hybi/no-subprotocol.html:
* http/tests/websocket/tests/hybi/null-character.html:
* http/tests/websocket/tests/hybi/pong.html:
* http/tests/websocket/tests/hybi/receive-arraybuffer.html:
* http/tests/websocket/tests/hybi/receive-blob.html:
* http/tests/websocket/tests/hybi/reload-crash.html:
* http/tests/websocket/tests/hybi/reserved-bits.html:
* http/tests/websocket/tests/hybi/reserved-opcodes.html:
* http/tests/websocket/tests/hybi/send-after-close-on-unload.html:
* http/tests/websocket/tests/hybi/send-arraybuffer.html:
* http/tests/websocket/tests/hybi/send-blob.html:
* http/tests/websocket/tests/hybi/send-empty.html:
* http/tests/websocket/tests/hybi/send-file-blob-fail.html:
* http/tests/websocket/tests/hybi/send-file-blob.html:
* http/tests/websocket/tests/hybi/send-object-tostring-check.html:
* http/tests/websocket/tests/hybi/send-throw.html:
* http/tests/websocket/tests/hybi/send.html:
* http/tests/websocket/tests/hybi/server-close.html:
* http/tests/websocket/tests/hybi/set-protocol.html:
* http/tests/websocket/tests/hybi/simple-stress.html:
* http/tests/websocket/tests/hybi/simple.html:
* http/tests/websocket/tests/hybi/sub-protocol.html:
* http/tests/websocket/tests/hybi/too-long-payload.html:
* http/tests/websocket/tests/hybi/unicode.html:
* http/tests/websocket/tests/hybi/unmasked-frames.html:
* http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason.html:
* http/tests/websocket/tests/hybi/unpaired-surrogates-in-message.html:
* http/tests/websocket/tests/hybi/url-attribute.html:
* http/tests/websocket/tests/hybi/url-no-trailing-slash.html:
* http/tests/websocket/tests/hybi/url-parsing.html:
* http/tests/websocket/tests/hybi/url-with-credential.html:
* http/tests/websocket/tests/hybi/url-with-empty-query.html:
* http/tests/websocket/tests/hybi/url-with-query.html:
* http/tests/websocket/tests/hybi/websocket-event-target.html:
* http/tests/websocket/tests/hybi/websocket-pending-activity.html:
* http/tests/websocket/tests/hybi/workers/close-code-and-reason.html:
* http/tests/websocket/tests/hybi/workers/close-in-onmessage-crash.html:
* http/tests/websocket/tests/hybi/workers/close-in-shared-worker.html:
* http/tests/websocket/tests/hybi/workers/close-in-worker.html:
* http/tests/websocket/tests/hybi/workers/close.html:
* http/tests/websocket/tests/hybi/workers/multiple-subprotocols.html:
* http/tests/websocket/tests/hybi/workers/no-onmessage-in-sync-op.html:
* http/tests/websocket/tests/hybi/workers/no-subprotocol.html:
* http/tests/websocket/tests/hybi/workers/receive-arraybuffer.html:
* http/tests/websocket/tests/hybi/workers/receive-blob.html:
* http/tests/websocket/tests/hybi/workers/send-arraybuffer.html:
* http/tests/websocket/tests/hybi/workers/send-blob.html:
* http/tests/websocket/tests/hybi/workers/shared-worker-simple.html:
* http/tests/websocket/tests/hybi/workers/worker-handshake-challenge-randomness.html:
* http/tests/websocket/tests/hybi/workers/worker-reload.html:
* http/tests/websocket/tests/hybi/workers/worker-simple.html:
* http/tests/websocket/tests/hybi/zero-length-text.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122256 268f45cc-cd09-0410-ab3c-d52691b4dbfc

119 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/inspector/web-socket-frame-error.html
LayoutTests/http/tests/inspector/websocket/web-socket-frame.html
LayoutTests/http/tests/websocket/tests/hybi/alert-in-event-handler.html
LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash.html
LayoutTests/http/tests/websocket/tests/hybi/bad-sub-protocol-control-chars.html
LayoutTests/http/tests/websocket/tests/hybi/bad-sub-protocol-empty.html
LayoutTests/http/tests/websocket/tests/hybi/bad-sub-protocol-non-ascii.html
LayoutTests/http/tests/websocket/tests/hybi/binary-type.html
LayoutTests/http/tests/websocket/tests/hybi/broken-utf8.html
LayoutTests/http/tests/websocket/tests/hybi/bufferedAmount-after-close-in-busy.html
LayoutTests/http/tests/websocket/tests/hybi/bufferedAmount-after-close.html
LayoutTests/http/tests/websocket/tests/hybi/client-close.html
LayoutTests/http/tests/websocket/tests/hybi/close-before-open.html
LayoutTests/http/tests/websocket/tests/hybi/close-code-and-reason.html
LayoutTests/http/tests/websocket/tests/hybi/close-event.html
LayoutTests/http/tests/websocket/tests/hybi/close-on-navigate-new-location.html
LayoutTests/http/tests/websocket/tests/hybi/close-on-unload-and-force-gc.html
LayoutTests/http/tests/websocket/tests/hybi/close-on-unload-reference-in-parent.html
LayoutTests/http/tests/websocket/tests/hybi/close-on-unload.html
LayoutTests/http/tests/websocket/tests/hybi/close-unref-websocket.html
LayoutTests/http/tests/websocket/tests/hybi/close.html
LayoutTests/http/tests/websocket/tests/hybi/compressed-control-frame.html
LayoutTests/http/tests/websocket/tests/hybi/cross-origin.html
LayoutTests/http/tests/websocket/tests/hybi/deflate-frame-comp-bit-onoff.html
LayoutTests/http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html
LayoutTests/http/tests/websocket/tests/hybi/deflate-frame-parameter.html
LayoutTests/http/tests/websocket/tests/hybi/echo-with-no-extension.html
LayoutTests/http/tests/websocket/tests/hybi/extensions.html
LayoutTests/http/tests/websocket/tests/hybi/fragmented-binary-frames.html
LayoutTests/http/tests/websocket/tests/hybi/fragmented-control-frame.html
LayoutTests/http/tests/websocket/tests/hybi/fragmented-frames.html
LayoutTests/http/tests/websocket/tests/hybi/frame-lengths.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-challenge-randomness.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-error.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-mismatch-protocol-header.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-more-accept-header.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-more-protocol-header.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null.html
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header.html
LayoutTests/http/tests/websocket/tests/hybi/httponly-cookie.pl
LayoutTests/http/tests/websocket/tests/hybi/interleaved-fragments.html
LayoutTests/http/tests/websocket/tests/hybi/invalid-continuation.html
LayoutTests/http/tests/websocket/tests/hybi/invalid-encode-length.html
LayoutTests/http/tests/websocket/tests/hybi/invalid-masked-frames-from-server.html
LayoutTests/http/tests/websocket/tests/hybi/invalid-subprotocol-characters.html
LayoutTests/http/tests/websocket/tests/hybi/invalid-subprotocols.html
LayoutTests/http/tests/websocket/tests/hybi/long-control-frame.html
LayoutTests/http/tests/websocket/tests/hybi/long-invalid-header.html
LayoutTests/http/tests/websocket/tests/hybi/multiple-connections.html
LayoutTests/http/tests/websocket/tests/hybi/multiple-subprotocols.html
LayoutTests/http/tests/websocket/tests/hybi/no-subprotocol.html
LayoutTests/http/tests/websocket/tests/hybi/null-character.html
LayoutTests/http/tests/websocket/tests/hybi/pong.html
LayoutTests/http/tests/websocket/tests/hybi/receive-arraybuffer.html
LayoutTests/http/tests/websocket/tests/hybi/receive-blob.html
LayoutTests/http/tests/websocket/tests/hybi/reload-crash.html
LayoutTests/http/tests/websocket/tests/hybi/reserved-bits.html
LayoutTests/http/tests/websocket/tests/hybi/reserved-opcodes.html
LayoutTests/http/tests/websocket/tests/hybi/send-after-close-on-unload.html
LayoutTests/http/tests/websocket/tests/hybi/send-arraybuffer.html
LayoutTests/http/tests/websocket/tests/hybi/send-blob.html
LayoutTests/http/tests/websocket/tests/hybi/send-empty.html
LayoutTests/http/tests/websocket/tests/hybi/send-file-blob-fail.html
LayoutTests/http/tests/websocket/tests/hybi/send-file-blob.html
LayoutTests/http/tests/websocket/tests/hybi/send-object-tostring-check.html
LayoutTests/http/tests/websocket/tests/hybi/send-throw.html
LayoutTests/http/tests/websocket/tests/hybi/send.html
LayoutTests/http/tests/websocket/tests/hybi/server-close.html
LayoutTests/http/tests/websocket/tests/hybi/set-protocol.html
LayoutTests/http/tests/websocket/tests/hybi/simple-stress.html
LayoutTests/http/tests/websocket/tests/hybi/simple.html
LayoutTests/http/tests/websocket/tests/hybi/sub-protocol.html
LayoutTests/http/tests/websocket/tests/hybi/too-long-payload.html
LayoutTests/http/tests/websocket/tests/hybi/unicode.html
LayoutTests/http/tests/websocket/tests/hybi/unmasked-frames.html
LayoutTests/http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason.html
LayoutTests/http/tests/websocket/tests/hybi/unpaired-surrogates-in-message.html
LayoutTests/http/tests/websocket/tests/hybi/url-attribute.html
LayoutTests/http/tests/websocket/tests/hybi/url-no-trailing-slash.html
LayoutTests/http/tests/websocket/tests/hybi/url-parsing.html
LayoutTests/http/tests/websocket/tests/hybi/url-with-credential.html
LayoutTests/http/tests/websocket/tests/hybi/url-with-empty-query.html
LayoutTests/http/tests/websocket/tests/hybi/url-with-query.html
LayoutTests/http/tests/websocket/tests/hybi/websocket-event-target.html
LayoutTests/http/tests/websocket/tests/hybi/websocket-pending-activity.html
LayoutTests/http/tests/websocket/tests/hybi/workers/close-code-and-reason.html
LayoutTests/http/tests/websocket/tests/hybi/workers/close-in-onmessage-crash.html
LayoutTests/http/tests/websocket/tests/hybi/workers/close-in-shared-worker.html
LayoutTests/http/tests/websocket/tests/hybi/workers/close-in-worker.html
LayoutTests/http/tests/websocket/tests/hybi/workers/close.html
LayoutTests/http/tests/websocket/tests/hybi/workers/multiple-subprotocols.html
LayoutTests/http/tests/websocket/tests/hybi/workers/no-onmessage-in-sync-op.html
LayoutTests/http/tests/websocket/tests/hybi/workers/no-subprotocol.html
LayoutTests/http/tests/websocket/tests/hybi/workers/receive-arraybuffer.html
LayoutTests/http/tests/websocket/tests/hybi/workers/receive-blob.html
LayoutTests/http/tests/websocket/tests/hybi/workers/send-arraybuffer.html
LayoutTests/http/tests/websocket/tests/hybi/workers/send-blob.html
LayoutTests/http/tests/websocket/tests/hybi/workers/shared-worker-simple.html
LayoutTests/http/tests/websocket/tests/hybi/workers/worker-handshake-challenge-randomness.html
LayoutTests/http/tests/websocket/tests/hybi/workers/worker-reload.html
LayoutTests/http/tests/websocket/tests/hybi/workers/worker-simple.html
LayoutTests/http/tests/websocket/tests/hybi/zero-length-text.html
Tools/ChangeLog
Tools/DumpRenderTree/chromium/LayoutTestController.cpp
Tools/DumpRenderTree/chromium/WebPreferences.cpp
Tools/DumpRenderTree/chromium/WebPreferences.h
Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
Tools/DumpRenderTree/win/DumpRenderTree.cpp

index f29f149..6918c84 100644 (file)
@@ -1,3 +1,120 @@
+2012-07-10  Adam Barth  <abarth@webkit.org>
+
+        Remove LayoutTestController and WebKitTestRunner support for Hixie76 WebSockets
+        https://bugs.webkit.org/show_bug.cgi?id=90853
+
+        Reviewed by Eric Seidel.
+
+        There's no need to explicitly disable the Hixie76 protocol because it
+        no longer exists in WebKit.
+
+        * http/tests/websocket/tests/hybi/alert-in-event-handler.html:
+        * http/tests/websocket/tests/hybi/bad-handshake-crash.html:
+        * http/tests/websocket/tests/hybi/bad-sub-protocol-control-chars.html:
+        * http/tests/websocket/tests/hybi/bad-sub-protocol-empty.html:
+        * http/tests/websocket/tests/hybi/bad-sub-protocol-non-ascii.html:
+        * http/tests/websocket/tests/hybi/binary-type.html:
+        * http/tests/websocket/tests/hybi/broken-utf8.html:
+        * http/tests/websocket/tests/hybi/bufferedAmount-after-close-in-busy.html:
+        * http/tests/websocket/tests/hybi/bufferedAmount-after-close.html:
+        * http/tests/websocket/tests/hybi/client-close.html:
+        * http/tests/websocket/tests/hybi/close-before-open.html:
+        * http/tests/websocket/tests/hybi/close-code-and-reason.html:
+        * http/tests/websocket/tests/hybi/close-event.html:
+        * http/tests/websocket/tests/hybi/close-on-navigate-new-location.html:
+        * http/tests/websocket/tests/hybi/close-on-unload-and-force-gc.html:
+        * http/tests/websocket/tests/hybi/close-on-unload-reference-in-parent.html:
+        * http/tests/websocket/tests/hybi/close-on-unload.html:
+        * http/tests/websocket/tests/hybi/close-unref-websocket.html:
+        * http/tests/websocket/tests/hybi/close.html:
+        * http/tests/websocket/tests/hybi/compressed-control-frame.html:
+        * http/tests/websocket/tests/hybi/cross-origin.html:
+        * http/tests/websocket/tests/hybi/deflate-frame-comp-bit-onoff.html:
+        * http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html:
+        * http/tests/websocket/tests/hybi/deflate-frame-parameter.html:
+        * http/tests/websocket/tests/hybi/echo-with-no-extension.html:
+        * http/tests/websocket/tests/hybi/extensions.html:
+        * http/tests/websocket/tests/hybi/fragmented-binary-frames.html:
+        * http/tests/websocket/tests/hybi/fragmented-control-frame.html:
+        * http/tests/websocket/tests/hybi/fragmented-frames.html:
+        * http/tests/websocket/tests/hybi/frame-lengths.html:
+        * http/tests/websocket/tests/hybi/handshake-challenge-randomness.html:
+        * http/tests/websocket/tests/hybi/handshake-error.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-maxlength.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-mismatch-protocol-header.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-more-accept-header.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-more-protocol-header.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-no-cr.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null.html:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header.html:
+        * http/tests/websocket/tests/hybi/httponly-cookie.pl:
+        * http/tests/websocket/tests/hybi/interleaved-fragments.html:
+        * http/tests/websocket/tests/hybi/invalid-continuation.html:
+        * http/tests/websocket/tests/hybi/invalid-encode-length.html:
+        * http/tests/websocket/tests/hybi/invalid-masked-frames-from-server.html:
+        * http/tests/websocket/tests/hybi/invalid-subprotocol-characters.html:
+        * http/tests/websocket/tests/hybi/invalid-subprotocols.html:
+        * http/tests/websocket/tests/hybi/long-control-frame.html:
+        * http/tests/websocket/tests/hybi/long-invalid-header.html:
+        * http/tests/websocket/tests/hybi/multiple-connections.html:
+        * http/tests/websocket/tests/hybi/multiple-subprotocols.html:
+        * http/tests/websocket/tests/hybi/no-subprotocol.html:
+        * http/tests/websocket/tests/hybi/null-character.html:
+        * http/tests/websocket/tests/hybi/pong.html:
+        * http/tests/websocket/tests/hybi/receive-arraybuffer.html:
+        * http/tests/websocket/tests/hybi/receive-blob.html:
+        * http/tests/websocket/tests/hybi/reload-crash.html:
+        * http/tests/websocket/tests/hybi/reserved-bits.html:
+        * http/tests/websocket/tests/hybi/reserved-opcodes.html:
+        * http/tests/websocket/tests/hybi/send-after-close-on-unload.html:
+        * http/tests/websocket/tests/hybi/send-arraybuffer.html:
+        * http/tests/websocket/tests/hybi/send-blob.html:
+        * http/tests/websocket/tests/hybi/send-empty.html:
+        * http/tests/websocket/tests/hybi/send-file-blob-fail.html:
+        * http/tests/websocket/tests/hybi/send-file-blob.html:
+        * http/tests/websocket/tests/hybi/send-object-tostring-check.html:
+        * http/tests/websocket/tests/hybi/send-throw.html:
+        * http/tests/websocket/tests/hybi/send.html:
+        * http/tests/websocket/tests/hybi/server-close.html:
+        * http/tests/websocket/tests/hybi/set-protocol.html:
+        * http/tests/websocket/tests/hybi/simple-stress.html:
+        * http/tests/websocket/tests/hybi/simple.html:
+        * http/tests/websocket/tests/hybi/sub-protocol.html:
+        * http/tests/websocket/tests/hybi/too-long-payload.html:
+        * http/tests/websocket/tests/hybi/unicode.html:
+        * http/tests/websocket/tests/hybi/unmasked-frames.html:
+        * http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason.html:
+        * http/tests/websocket/tests/hybi/unpaired-surrogates-in-message.html:
+        * http/tests/websocket/tests/hybi/url-attribute.html:
+        * http/tests/websocket/tests/hybi/url-no-trailing-slash.html:
+        * http/tests/websocket/tests/hybi/url-parsing.html:
+        * http/tests/websocket/tests/hybi/url-with-credential.html:
+        * http/tests/websocket/tests/hybi/url-with-empty-query.html:
+        * http/tests/websocket/tests/hybi/url-with-query.html:
+        * http/tests/websocket/tests/hybi/websocket-event-target.html:
+        * http/tests/websocket/tests/hybi/websocket-pending-activity.html:
+        * http/tests/websocket/tests/hybi/workers/close-code-and-reason.html:
+        * http/tests/websocket/tests/hybi/workers/close-in-onmessage-crash.html:
+        * http/tests/websocket/tests/hybi/workers/close-in-shared-worker.html:
+        * http/tests/websocket/tests/hybi/workers/close-in-worker.html:
+        * http/tests/websocket/tests/hybi/workers/close.html:
+        * http/tests/websocket/tests/hybi/workers/multiple-subprotocols.html:
+        * http/tests/websocket/tests/hybi/workers/no-onmessage-in-sync-op.html:
+        * http/tests/websocket/tests/hybi/workers/no-subprotocol.html:
+        * http/tests/websocket/tests/hybi/workers/receive-arraybuffer.html:
+        * http/tests/websocket/tests/hybi/workers/receive-blob.html:
+        * http/tests/websocket/tests/hybi/workers/send-arraybuffer.html:
+        * http/tests/websocket/tests/hybi/workers/send-blob.html:
+        * http/tests/websocket/tests/hybi/workers/shared-worker-simple.html:
+        * http/tests/websocket/tests/hybi/workers/worker-handshake-challenge-randomness.html:
+        * http/tests/websocket/tests/hybi/workers/worker-reload.html:
+        * http/tests/websocket/tests/hybi/workers/worker-simple.html:
+        * http/tests/websocket/tests/hybi/zero-length-text.html:
+
 2012-07-10  Rafael Weinstein  <rafaelw@chromium.org>
 
         Unreviewed gardening. Adding the majority of the remaining indexeddb/mozilla tests which are all flaky and crashing.
index 24bc8f6..cb8bdb2 100644 (file)
@@ -3,8 +3,6 @@
 <script src="inspector-test.js"></script>
 <script src="../../../../js-test-resources/js-test-pre.js"></script>
 <script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 var ws;
 function sendMessages() {
     ws = new WebSocket("ws://localhost:8000/websocket/tests/hybi/does_not_exist");
index 12c8305..db70855 100644 (file)
@@ -3,8 +3,6 @@
 <script src="../inspector-test.js"></script>
 <script src="../../../../../js-test-resources/js-test-pre.js"></script>
 <script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 var ws;
 function sendMessages() {
     ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/echo");
index d15cd45..8757a19 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure event handler called serially.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/send2");
 
index 6246384..a9e51f8 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure WebSocket doesn't crash with bad handshake message.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/bad-handshake-crash");
 ws.onopen = function () {
index 4f8dfb4..4e518b4 100644 (file)
@@ -9,9 +9,6 @@
 <script type="text/javascript">
 description("Test WebSocket bad sub-protocol names by control characters.");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 // Fails if protocol contains an character less than U+0020.
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0000")');
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0009")');
index 19cc9af..346d443 100644 (file)
@@ -9,9 +9,6 @@
 <script type="text/javascript">
 description("Test WebSocket bad sub-protocol names (empty).");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 // Fails if protocol is an empty string.
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "")');
 
index ea8fc7b..88c0b8f 100644 (file)
@@ -9,9 +9,6 @@
 <script type="text/javascript">
 description("Test WebSocket bad sub-protocol names by non-ASCII chars.");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 // Fails if protocol contains an character greater than U+007E.
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u007F")');
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0080")');
index 385b100..9096bfe 100644 (file)
@@ -9,9 +9,6 @@
 <script>
 description("Test WebSocket.binaryType attribute.");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/simple");
 shouldBeEqualToString("ws.binaryType", "blob");
 
index 30bee1b..1643c8e 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket aborts the connection when it receives a text frame containing broken UTF-8 data.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/broken-utf8");
 var closeEvent;
index e497505..d5f7622 100644 (file)
@@ -10,8 +10,6 @@
 description("Web Socket bufferedAmount after closed in busy");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function createStringWithLength(length)
 {
index 304366c..e57a4ca 100644 (file)
@@ -10,8 +10,6 @@
 description("Web Socket bufferedAmount after closed");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function createStringWithLength(length)
 {
index 1199df3..5c5fa97 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Test client-initiated close.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/client-close");
 var closeEvent;
index 84a7d8f..9a77ca7 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if Web Socket fires close event when WebSocket is opened and closed fore open event is received.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var urls = [
     "ws://127.0.0.1:8880/websocket/tests/hybi/echo",
index 116f506..54cf60f 100644 (file)
@@ -10,8 +10,6 @@
 description("Test CloseEvent code and reason property.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var closeEvent;
 var codeNormalClosure = 1000;
index 0e836da..7c6bb57 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure WebSocket fires CloseEvent when closed.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/simple");
 
index cfbac58..157d078 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if Web Socket is closed when navigating to new location.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var frameDiv;
 var closedSocket;
index eccdcef..735fea3 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if Web Socket is closed on unload and not crashed if garbage collected");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var frameDiv;
 var closedSocket;
index 6e21e6c..269ff9b 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if Web Socket opened in iframe but referred in parent document is closed on unloading the frame.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var frameDiv;
 var closedSocket;
index 5dd9645..b18e739 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if Web Socket is closed on unload");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var frameDiv;
 var closedSocket;
index 2db6397..e2c76a7 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if Web Socket is closed while handshaking and unreferenced, it should fire close event at most once.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var countCloseEvent = 0;
 
index f278a5d..a7c5a51 100644 (file)
@@ -10,8 +10,6 @@
 description("Verify WebSocket::close behaviors.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var exceptionName;
 var exceptionProto;
index 63683dd..148a203 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether a compressed control frame is rejected");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/compressed-control-frame");
 var closeEvent;
index 1ba7604..c4cd453 100644 (file)
@@ -10,8 +10,6 @@
 description("Web Socket Cross Origin test");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var origin;
 
index 34144f7..caf88a4 100644 (file)
@@ -10,8 +10,6 @@
 description("Test compression enabled/disabled frame receiving.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var closeEvent;
 var ws;
index 03e121f..3cf67eb 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket rejects invalid deflate-frame parameters.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var closeEvent;
 
index 7b88ec0..1b87855 100644 (file)
@@ -10,8 +10,6 @@
 description("Test WebSocket deflate-frame extension.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var closeEvent;
 var ws;
index c1b01b3..19d5b77 100644 (file)
@@ -10,8 +10,6 @@
 description("Test WebSocket.extensions attribute with no extension support in server side.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/echo-with-no-extension");
 debug("Check the value before opening the connection:");
index 5a8ffec..ea42377 100644 (file)
@@ -10,8 +10,6 @@
 description("Test WebSocket.extensions attribute.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/simple");
 debug("Check the value before opening the connection:");
index dd1e59e..96e7417 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Receive fragmented binary messages.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function createHelloWorldValue()
 {
index c88df64..636a0fb 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket rejects a fragmented control frame and aborts the connection.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/fragmented-control-frame";
 var ws = new WebSocket(url);
index 58bf89b..1624d0a 100644 (file)
@@ -10,8 +10,6 @@
 description("Receive fragmented WebSocket frames.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/fragmented-frames";
 var ws = new WebSocket(url);
index 1a8d64f..99a22ff 100644 (file)
@@ -8,7 +8,6 @@ var maxLength = 1025;
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index ca5cac9..54a8ec9 100644 (file)
@@ -10,8 +10,6 @@
 description('Handshake request should contain random challenge values.');
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var challenge1;
 var challenge2;
index 1c0c01c..578123d 100644 (file)
@@ -10,8 +10,6 @@
 description("Handshake error test");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index 807ae6a..8998d29 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket handshake fails if the server sends Sec-WebSocket-Extensions header.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/handshake-fail-by-extensions-header";
 var ws = new WebSocket(url);
index 3fbc70e..eccc260 100644 (file)
@@ -10,8 +10,6 @@
 description('Connection should fail immediately, rather than succeeding or staying in limbo until timeout, if handshake is longer than 1024 bytes.');
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var timedOut = false;
 var connected = false;
index 6033b5b..425bd88 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket handshake fails if the server sends mismatched Sec-WebSocket-Protocol header.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/handshake-fail-by-mismatch-protocol-header";
 var closeEvent;
index 2ba22e7..43290f2 100644 (file)
@@ -10,8 +10,6 @@
 description("Test that WebSocket handshake fails if there are more one Sec-WebSocket-Accept header field in the response.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index 9632ed1..670ad60 100644 (file)
@@ -10,8 +10,6 @@
 description("Test that WebSocket handshake fails if there are more than one Sec-WebSocket-Protocol header field in the response.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index 9b1ff06..2ded833 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket handshake fails if the server does not send Sec-WebSocket-Accept header.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/handshake-fail-by-no-accept-header";
 var ws = new WebSocket(url);
index 3a8bdaf..43f6dd5 100644 (file)
@@ -10,8 +10,6 @@
 description("Test that WebSocket handshake fails if Connection header field isn't reflected by the server.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index 39800d6..1d93411 100644 (file)
@@ -10,8 +10,6 @@
 description('Handshake should fail when the first line does not end with CRLF.');
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var connected = false;
 var origin;
index 5f1d679..41e9af1 100644 (file)
@@ -10,8 +10,6 @@
 description("Test that WebSocket handshake fails if Upgrade header field isn't reflected by the server.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index 0e2cea5..f21b6cf 100644 (file)
@@ -10,8 +10,6 @@
 description('Connection should fail immediately, rather than succeeding or staying in limbo until timeout, if a null byte is received before the handshake.');
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var timedOut = false;
 var connected = false;
index 2a1242e..27ee9cc 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket handshake fails if the server sends incorrect Sec-WebSocket-Accept header.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/handshake-fail-by-wrong-accept-header";
 var ws = new WebSocket(url);
index a5ca590..56d636c 100755 (executable)
@@ -25,8 +25,6 @@ print <<HTML
 <div id="console"></div>
 <script>
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var cookie;
 
index 048d341..19f67fc 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket rejects interleaved fragmented frames.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/interleaved-fragments";
 var ws = new WebSocket(url);
index 83e47fc..927f224 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket aborts the connection when it receives an unexpected continuation frame without any leading text or binary frame.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/invalid-continuation");
 var closeEvent;
index 6cd9ba4..25b9ffb 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket aborts the connection when it receives an unexpected encoding length frame.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var closeEvent;
 var payload_extended = ["126_125", "126_0", "127_65535", "127_0"];
index e397b28..89da372 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket aborts the connection when it receives an masked frames from server.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/invalid-masked-frames-from-server";
 var ws = new WebSocket(url);
index dead50e..5afbb6d 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket should fail if subprotocol contains a forbidden character.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function escapeUnicodeCharacter(codePoint)
 {
index cf05cfb..a00ac13 100644 (file)
@@ -9,9 +9,6 @@
 <script type="text/javascript">
 description("WebSocket should fail if invalid subprotocols are specified");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 var url = "ws://127.0.0.1:8880/websocket/tests/simple";
 shouldThrow("new WebSocket(url, 'a b')", "'Error: SYNTAX_ERR: DOM Exception 12'");
 shouldThrow("new WebSocket(url, 'a,b')", "'Error: SYNTAX_ERR: DOM Exception 12'");
index 09841ca..0024f15 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket rejects control frames longer than 125 bytes.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/long-control-frame";
 var ws = new WebSocket(url);
index 6c1e18f..2cb9b1b 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure WebSocket gives errors on long invalid upgrade header.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function finish() {
     clearTimeout(timeoutID);
index 3fa7120..f233e1c 100644 (file)
@@ -4,7 +4,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 var socketCount = 50;
index f765d8c..be6c730 100644 (file)
@@ -10,8 +10,6 @@
 description("Test WebSocket subprotocol negotiation.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/protocol-test?protocol=superchat", ["chat", "superchat"]);
 var closeEvent;
index 856e159..c6436b9 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket's protocol attribute should be an empty string if the server did not provide Sec-WebSocket-Protocol header.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/simple");
 var closeEvent;
index 6b74c25..f6ceb94 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure WebSocket transfer null character");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/echo");
 // \xff in string would be \xc3\xbf on websocket connection (UTF-8)
index 0dd60d0..a45e347 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket correctly responds to a ping message sent from the server.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/pong";
 var ws = new WebSocket(url);
index f05a54e..0a25c73 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Receive ArrayBuffers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function createArrayBufferContainingHelloWorld()
 {
index c90bb8d..3a7da73 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Receive Blobs.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function createArrayBufferContainingHelloWorld()
 {
index c6f2fcb..68ae361 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if it doesn't crash when reloading while Web Socket is busy");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var frameDiv;
 var reloadCount = 0;
index 434909c..1941396 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket rejects frames whose reserved bit is on.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 // "compressed=true&bitNumber=1" must not be included in compressedAndBitNumberParameters array.
 var compressedAndBitNumberParameters = ["compressed=false&bitNumber=1",
index b69d49e..356ed71 100644 (file)
@@ -10,8 +10,6 @@
 description("Tests whether WebSocket ignores frames with reserved opcode.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var closeEvent;
 
index e22fdaa..a7248db 100644 (file)
@@ -10,8 +10,6 @@
 description("Test if Web Socket opened in iframe, referred in parent document is, and try to send() returns false.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var frameDiv;
 var closedSocket;
index 194246e..7e47813 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Send ArrayBuffers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(target, prefix)
 {
index 2124aa0..f32ca70 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Send Blobs.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(target, prefix)
 {
index 939d983..9e386db 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Calling send() without arguments should raise SyntaxError.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/echo");
 
index ef77d59..7deafd2 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket should fail the connection if it has failed to read a Blob.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(target, prefix)
 {
index 39e94ea..fe344c1 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Send a File.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(target, prefix)
 {
index 5d5e497..d98b21d 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Object's toString method should be called only once.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 
 var testObj = new function() {
index 0645683..464b7f6 100644 (file)
@@ -10,8 +10,6 @@
 description("Web Socket send test");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index 7eef24e..fb3ce57 100644 (file)
@@ -10,8 +10,6 @@
 description("Web Socket send test");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index b82d12c..73b0ae1 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Test server-initiated close.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/server-close");
 var closeEvent;
index 17d7baa..261c731 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket.protocol should not be modified.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/accept-first-subprotocol", "chat");
 var closeEvent;
index 3b51e8d..ef99f1a 100644 (file)
@@ -8,7 +8,6 @@ var numSmallMessages = 1000;
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index 1cf62d0..3193bb8 100644 (file)
@@ -10,8 +10,6 @@
 description("Simple Web Socket test");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index 8ce0824..c37487f 100644 (file)
@@ -10,8 +10,6 @@
 description("Test WebSocket handshake success with sub protocol.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var protocol;
 
index 38ae847..6481b9d 100644 (file)
@@ -10,8 +10,6 @@
 description("Tests whether WebSocket correctly aborts the connection when it receives a frame with too long payload.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/too-long-payload");
 var closeEvent;
index 46328ab..7429cae 100644 (file)
@@ -10,8 +10,6 @@
 description("Web Socket unicode message test");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function endTest()
 {
index c9b9b2f..2e549a4 100644 (file)
@@ -10,8 +10,6 @@
 description("Receive unmasked WebSocket frames.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://localhost:8880/websocket/tests/hybi/unmasked-frames";
 var ws = new WebSocket(url);
index 973a95d..6b13191 100644 (file)
@@ -10,8 +10,6 @@
 description("Checks whether SYNTAX_ERR is thrown when attemping to close the connection with unpaired surrogates.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/echo");
 
index 9a87372..44078b7 100644 (file)
@@ -10,8 +10,6 @@
 description("Checks whether SYNTAX_ERR is thrown when attemping to send unpaired surrogates.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/echo");
 
index 15fd31d..b5315fa 100644 (file)
@@ -10,9 +10,6 @@
 
 description("Both .URL and .url attributes should work (for compatibility reasons).");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 var url = "ws://127.0.0.1:8880/";
 var ws = new WebSocket(url);
 
index 42953b4..bca6c27 100644 (file)
@@ -10,8 +10,6 @@
 description("URL that doesn't have trailing slash should not emit empty Request-URI.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://127.0.0.1:8880";
 var handshake_success = false;
index 6a0e778..73d368b 100644 (file)
@@ -9,9 +9,6 @@
 <script type="text/javascript">
 description("Test WebSocket URL parsing.");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 // Not enough arguments.
 shouldThrow('new WebSocket()');
 
index 4b33c67..9b956c7 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure handshake with URL with credentail info success.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://user:pass@127.0.0.1:8880/websocket/tests/hybi/echo-location";
 var handshake_success = false;
index f5471bd..218ac75 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure handshake with URL with empty query components success.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://127.0.0.1:8880/websocket/tests/hybi/echo-location?";
 var handshake_success = false;
index d5d9a99..12e6f26 100644 (file)
@@ -10,8 +10,6 @@
 description("Make sure handshake with URL with query components success.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var url = "ws://127.0.0.1:8880/websocket/tests/hybi/echo-location?q=v";
 var handshake_success = false;
index 5c62918..3c2ee6e 100644 (file)
@@ -9,9 +9,6 @@
 <script type="text/javascript">
 description("Make sure WebSocket object acts as EventTarget.");
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/simple");
 ws.close(); // That is not a test with a WebSocket server, prevent logging an error to console.
 var open_event_handled = false;
index 89172c4..4e575cd 100644 (file)
@@ -4,7 +4,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function gc()
index 165d66a..2b4c94d 100644 (file)
@@ -10,8 +10,6 @@
 description("Test CloseEvent code and reason property in Worker.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index 0e3d938..0420110 100644 (file)
@@ -11,7 +11,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index 8a124f9..5a38fb2 100644 (file)
@@ -11,7 +11,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index a823e9d..ce1b01a 100644 (file)
@@ -11,7 +11,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index 04e4ed4..96079d6 100644 (file)
@@ -10,8 +10,6 @@
 description("Verify WebSocket::close behaviors in Worker.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index 4e377cb..5b18f00 100644 (file)
@@ -10,8 +10,6 @@
 description("Test WebSocket subprotocol negotiation in workers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index 2425992..7794f23 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket's message event should not be invoked while we are waiting for the result of a synchronous operation (such as WebSocket.send()) on workers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index 5275886..ac8c65f 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket's protocol attribute should be an empty string if the server did not provide Sec-WebSocket-Protocol header.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index fbb9807..a716eea 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Receive ArrayBuffers in Web Workers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index 77b136a..90be49a 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Receive Blobs in Web Workers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index fa13c94..d23e95c 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Send ArrayBuffers in Web Workers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index 839857e..7fc411e 100644 (file)
@@ -10,8 +10,6 @@
 description("WebSocket: Send Blobs in Web Workers.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 function startsWith(str, prefix)
 {
index fca6f18..4edc0b6 100644 (file)
@@ -11,7 +11,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index a421c12..ea028ca 100644 (file)
@@ -11,7 +11,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index 6b4a0af..8164b3b 100644 (file)
@@ -10,8 +10,6 @@
 description("Reload after WebSocket creation should not cause a crash.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 document.iframeFinished = function()
 {
index ecc6d99..a27d437 100644 (file)
@@ -11,7 +11,6 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function log(message)
index dd95598..c142ed4 100644 (file)
@@ -10,8 +10,6 @@
 description("Test whether WebSocket handles zero length text frame correctly.");
 
 window.jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/zero-length-text");
 var closeEvent;
index f787f74..68a4b3b 100644 (file)
@@ -1,3 +1,33 @@
+2012-07-10  Adam Barth  <abarth@webkit.org>
+
+        Remove LayoutTestController and WebKitTestRunner support for Hixie76 WebSockets
+        https://bugs.webkit.org/show_bug.cgi?id=90853
+
+        Reviewed by Eric Seidel.
+
+        WebKit no longer implements the Hixie76 version of the WebSocket
+        protocol. We don't need to support it in our test framework.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::overridePreference):
+        * DumpRenderTree/chromium/WebPreferences.cpp:
+        (WebPreferences::reset):
+        (WebPreferences::applyTo):
+        * DumpRenderTree/chromium/WebPreferences.h:
+        (WebPreferences):
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::overridePreference):
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::resetSettings):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::overridePreference):
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+
 2012-07-10  Xianzhu Wang  <wangxianzhu@chromium.org>
 
         [Chromium-Android] Use setup_test_runner() instead of start_helper() to setup test environment
index 9d2013b..d5c9019 100644 (file)
@@ -1580,8 +1580,6 @@ void LayoutTestController::overridePreference(const CppArgumentList& arguments,
         prefs->allowDisplayOfInsecureContent = cppVariantToBool(value);
     else if (key == "WebKitAllowRunningInsecureContent")
         prefs->allowRunningOfInsecureContent = cppVariantToBool(value);
-    else if (key == "WebKitHixie76WebSocketProtocolEnabled")
-        prefs->hixie76WebSocketProtocolEnabled = cppVariantToBool(value);
     else if (key == "WebKitCSSCustomFilterEnabled")
         prefs->cssCustomFilterEnabled = cppVariantToBool(value);
     else if (key == "WebKitWebAudioEnabled") {
index a779ee9..c4de0ab 100644 (file)
@@ -116,7 +116,6 @@ void WebPreferences::reset()
     deferred2dCanvasEnabled = false;
     acceleratedPaintingEnabled = false;
     forceCompositingMode = false;
-    hixie76WebSocketProtocolEnabled = true;
     mediaPlaybackRequiresUserGesture = false;
     mockScrollbarsEnabled = false;
     cssCustomFilterEnabled = false;
@@ -225,7 +224,6 @@ void WebPreferences::applyTo(WebView* webView)
     settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
     settings->setDeferred2dCanvasEnabled(deferred2dCanvasEnabled);
     settings->setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
-    settings->setHixie76WebSocketProtocolEnabled(hixie76WebSocketProtocolEnabled);
     settings->setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
     settings->setMockScrollbarsEnabled(mockScrollbarsEnabled);
 
index d42f9b0..c36553b 100644 (file)
@@ -109,7 +109,6 @@ struct WebPreferences {
     bool accelerated2dCanvasEnabled;
     bool deferred2dCanvasEnabled;
     bool acceleratedPaintingEnabled;
-    bool hixie76WebSocketProtocolEnabled;
     bool mediaPlaybackRequiresUserGesture;
     bool mockScrollbarsEnabled;
     bool cssCustomFilterEnabled;
index 1201713..8e3c44e 100644 (file)
@@ -512,7 +512,6 @@ static void resetDefaultsToConsistentValues()
 
     DumpRenderTreeSupportGtk::resetGeolocationClientMock(webView);
 
-    DumpRenderTreeSupportGtk::setHixie76WebSocketProtocolEnabled(webView, true);
     DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled(webView, false);
     DumpRenderTreeSupportGtk::setCSSRegionsEnabled(webView, true);
 }
index 0782ac2..2eb899d 100644 (file)
@@ -801,9 +801,6 @@ void LayoutTestController::overridePreference(JSStringRef key, JSStringRef value
     else if (g_str_equal(originalName.get(), "WebKitTabToLinksPreferenceKey")) {
         DumpRenderTreeSupportGtk::setLinksIncludedInFocusChain(booleanFromValue(valueAsString.get()));
         return;
-    } else if (g_str_equal(originalName.get(), "WebKitHixie76WebSocketProtocolEnabled")) {
-        DumpRenderTreeSupportGtk::setHixie76WebSocketProtocolEnabled(webkit_web_frame_get_web_view(mainFrame), booleanFromValue(valueAsString.get()));
-        return;
     } else if (g_str_equal(originalName.get(), "WebKitPageCacheSupportsPluginsPreferenceKey")) {
         DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins(webkit_web_frame_get_web_view(mainFrame), booleanFromValue(valueAsString.get()));
         return;
index 96c47e2..dd0eff4 100644 (file)
@@ -664,7 +664,6 @@ static void resetDefaultsToConsistentValues()
     [preferences setCSSGridLayoutEnabled:NO];
     [preferences setUsePreHTML5ParserQuirks:NO];
     [preferences setAsynchronousSpellCheckingEnabled:NO];
-    [preferences setHixie76WebSocketProtocolEnabled:NO];
     [preferences setMockScrollbarsEnabled:YES];
 
 #if ENABLE(WEB_AUDIO)
index 48bb457..12d659a 100755 (executable)
@@ -208,7 +208,6 @@ void WebPage::resetSettings()
     settings()->setUserStyleSheetUrl(QUrl()); // reset to default
 
     DumpRenderTreeSupportQt::setMinimumTimerInterval(this, DumpRenderTreeSupportQt::defaultMinimumTimerInterval());
-    DumpRenderTreeSupportQt::setHixie76WebSocketProtocolEnabled(this, DumpRenderTreeSupportQt::defaultHixie76WebSocketProtocolEnabled());
 
     DumpRenderTreeSupportQt::resetInternalsObject(mainFrame());
 
index 0d27aff..bc88cb4 100644 (file)
@@ -672,8 +672,6 @@ void LayoutTestController::overridePreference(const QString& name, const QVarian
         settings->setAttribute(QWebSettings::CSSGridLayoutEnabled, value.toBool());
     else if (name == "WebKitHyperlinkAuditingEnabled")
         settings->setAttribute(QWebSettings::HyperlinkAuditingEnabled, value.toBool());
-    else if (name == "WebKitHixie76WebSocketProtocolEnabled")
-        DumpRenderTreeSupportQt::setHixie76WebSocketProtocolEnabled(m_topLoadingFrame->page(), value.toBool());
     else if (name == "WebKitAcceleratedCompositingEnabled")
         settings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, value.toBool());
     else
index a6f583f..f402a02 100644 (file)
@@ -866,7 +866,6 @@ static void resetDefaultsToConsistentValues(IWebPreferences* preferences)
         prefsPrivate->setFrameFlatteningEnabled(FALSE);
         prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
         prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);
-        prefsPrivate->setHixie76WebSocketProtocolEnabled(FALSE);
     }
     setAlwaysAcceptCookies(false);