Changeset 90704 in webkit

Timestamp:

Jul 10, 2011 7:04:32 PM (13 years ago)

Author:

yutak@chromium.org

Message:

WebSocket: Add useHixie76Protocol flag to WebSocketChannel and WebSocketHandshake
​https://bugs.webkit.org/show_bug.cgi?id=64244

Reviewed by Kent Tamura.

Get the value of Settings::useHixie76WebSocketProtocol() and save it in
WebSocketChannel and WebSocketHandshake instances. Obtained flag value
is not used for now.

No behavior change, thus no new tests.

• websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::WebSocketChannel):
WebSocketChannel is always created in context of Document (see
ThreadableWebSocketChannel::create()).
Because m_useHixie76Protocol must be passed to WebSocketHandshake
constructor, WebSocketHandshake instance is allocated dynamically
and stored in OwnPtr.
(WebCore::WebSocketChannel::connect):
(WebCore::WebSocketChannel::fail):
(WebCore::WebSocketChannel::disconnect):
(WebCore::WebSocketChannel::didOpen):
(WebCore::WebSocketChannel::didFail):
(WebCore::WebSocketChannel::processBuffer):

• websockets/WebSocketChannel.h:
• websockets/WebSocketHandshake.cpp:

(WebCore::WebSocketHandshake::WebSocketHandshake):

• websockets/WebSocketHandshake.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• websockets/WebSocketChannel.cpp (modified) (10 diffs)
• websockets/WebSocketChannel.h (modified) (2 diffs)
• websockets/WebSocketHandshake.cpp (modified) (1 diff)
• websockets/WebSocketHandshake.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-10  Yuta Kitamura  <yutak@chromium.org>
+
+        WebSocket: Add useHixie76Protocol flag to WebSocketChannel and WebSocketHandshake
+        https://bugs.webkit.org/show_bug.cgi?id=64244
+
+        Reviewed by Kent Tamura.
+
+        Get the value of Settings::useHixie76WebSocketProtocol() and save it in
+        WebSocketChannel and WebSocketHandshake instances. Obtained flag value
+        is not used for now.
+
+        No behavior change, thus no new tests.
+
+        * websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::WebSocketChannel):
+        WebSocketChannel is always created in context of Document (see
+        ThreadableWebSocketChannel::create()).
+        Because m_useHixie76Protocol must be passed to WebSocketHandshake
+        constructor, WebSocketHandshake instance is allocated dynamically
+        and stored in OwnPtr.
+        (WebCore::WebSocketChannel::connect):
+        (WebCore::WebSocketChannel::fail):
+        (WebCore::WebSocketChannel::disconnect):
+        (WebCore::WebSocketChannel::didOpen):
+        (WebCore::WebSocketChannel::didFail):
+        (WebCore::WebSocketChannel::processBuffer):
+        * websockets/WebSocketChannel.h:
+        * websockets/WebSocketHandshake.cpp:
+        (WebCore::WebSocketHandshake::WebSocketHandshake):
+        * websockets/WebSocketHandshake.h:
+
 2011-07-10  Tom Hudson  <tomhudson@google.com>
 

trunk/Source/WebCore/websockets/WebSocketChannel.cpp

@@ -43 +43 @@
 #include "ScriptCallStack.h"
 #include "ScriptExecutionContext.h"
+#include "Settings.h"
 #include "SocketStreamError.h"
 #include "SocketStreamHandle.h"
@@ -62 +63 @@
     : m_context(context)
     , m_client(client)
-    , m_handshake(url, protocol, context)
     , m_buffer(0)
     , m_bufferSize(0)
@@ -74 +74 @@
     , m_unhandledBufferedAmount(0)
     , m_identifier(0)
-{
-    if (m_context->isDocument())
-        if (Page* page = static_cast<Document*>(m_context)->page())
-            m_identifier = page->progress()->createUniqueIdentifier();
-
+    , m_useHixie76Protocol(true)
+{
+    ASSERT(m_context->isDocument());
+    Document* document = static_cast<Document*>(m_context);
+    if (Settings* settings = document->settings())
+        m_useHixie76Protocol = settings->useHixie76WebSocketProtocol();
+    m_handshake = adoptPtr(new WebSocketHandshake(url, protocol, context, m_useHixie76Protocol));
+
+    if (Page* page = document->page())
+        m_identifier = page->progress()->createUniqueIdentifier();
     if (m_identifier)
         InspectorInstrumentation::didCreateWebSocket(m_context, m_identifier, url, m_context->url());
@@ -93 +98 @@
     ASSERT(!m_handle);
     ASSERT(!m_suspended);
-    m_handshake.reset();
+    m_handshake->reset();
     ref();
-    m_handle = SocketStreamHandle::create(m_handshake.url(), this);
+    m_handle = SocketStreamHandle::create(m_handshake->url(), this);
 }
 
@@ -135 +140 @@
     ASSERT(!m_suspended);
     if (m_context)
-        m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, reason, 0, m_handshake.clientOrigin(), 0);
+        m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, reason, 0, m_handshake->clientOrigin(), 0);
     if (m_handle && !m_closed)
         m_handle->disconnect(); // Will call didClose().
@@ -145 +150 @@
     if (m_identifier && m_context)
         InspectorInstrumentation::didCloseWebSocket(m_context, m_identifier);
-    m_handshake.clearScriptExecutionContext();
+    m_handshake->clearScriptExecutionContext();
     m_client = 0;
     m_context = 0;
@@ -171 +176 @@
         return;
     if (m_identifier)
-        InspectorInstrumentation::willSendWebSocketHandshakeRequest(m_context, m_identifier, m_handshake.clientHandshakeRequest());
-    CString handshakeMessage = m_handshake.clientHandshakeMessage();
+        InspectorInstrumentation::willSendWebSocketHandshakeRequest(m_context, m_identifier, m_handshake->clientHandshakeRequest());
+    CString handshakeMessage = m_handshake->clientHandshakeMessage();
     if (!handle->send(handshakeMessage.data(), handshakeMessage.length()))
         fail("Failed to send WebSocket handshake.");
@@ -242 +247 @@
             message = "WebSocket network error: " + error.localizedDescription();
         String failingURL = error.failingURL();
-        ASSERT(failingURL.isNull() || m_handshake.url().string() == failingURL);
+        ASSERT(failingURL.isNull() || m_handshake->url().string() == failingURL);
         if (failingURL.isNull())
-            failingURL = m_handshake.url().string();
+            failingURL = m_handshake->url().string();
         m_context->addMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, 0, failingURL, 0);
     }
@@ -308 +313 @@
     RefPtr<WebSocketChannel> protect(this); // The client can close the channel, potentially removing the last reference.
 
-    if (m_handshake.mode() == WebSocketHandshake::Incomplete) {
-        int headerLength = m_handshake.readServerHandshake(m_buffer, m_bufferSize);
+    if (m_handshake->mode() == WebSocketHandshake::Incomplete) {
+        int headerLength = m_handshake->readServerHandshake(m_buffer, m_bufferSize);
         if (headerLength <= 0)
             return false;
-        if (m_handshake.mode() == WebSocketHandshake::Connected) {
+        if (m_handshake->mode() == WebSocketHandshake::Connected) {
             if (m_identifier)
-                InspectorInstrumentation::didReceiveWebSocketHandshakeResponse(m_context, m_identifier, m_handshake.serverHandshakeResponse());
-            if (!m_handshake.serverSetCookie().isEmpty()) {
+                InspectorInstrumentation::didReceiveWebSocketHandshakeResponse(m_context, m_identifier, m_handshake->serverHandshakeResponse());
+            if (!m_handshake->serverSetCookie().isEmpty()) {
                 if (m_context->isDocument()) {
                     Document* document = static_cast<Document*>(m_context);
                     if (cookiesEnabled(document)) {
                         ExceptionCode ec; // Exception (for sandboxed documents) ignored.
-                        document->setCookie(m_handshake.serverSetCookie(), ec);
+                        document->setCookie(m_handshake->serverSetCookie(), ec);
                     }
                 }
@@ -331 +336 @@
             return m_buffer;
         }
-        ASSERT(m_handshake.mode() == WebSocketHandshake::Failed);
+        ASSERT(m_handshake->mode() == WebSocketHandshake::Failed);
         LOG(Network, "WebSocketChannel %p connection failed", this);
         skipBuffer(headerLength);
         m_shouldDiscardReceivedData = true;
-        fail(m_handshake.failureReason());
-        return false;
-    }
-    if (m_handshake.mode() != WebSocketHandshake::Connected)
+        fail(m_handshake->failureReason());
+        return false;
+    }
+    if (m_handshake->mode() != WebSocketHandshake::Connected)
         return false;
 

trunk/Source/WebCore/websockets/WebSocketChannel.h

@@ -91 +91 @@
         ScriptExecutionContext* m_context;
         WebSocketChannelClient* m_client;
-        WebSocketHandshake m_handshake;
+        OwnPtr<WebSocketHandshake> m_handshake;
         RefPtr<SocketStreamHandle> m_handle;
         char* m_buffer;
@@ -106 +106 @@
 
         unsigned long m_identifier; // m_identifier == 0 means that we could not obtain a valid identifier.
+
+        bool m_useHixie76Protocol;
     };
 

trunk/Source/WebCore/websockets/WebSocketHandshake.cpp

@@ -160 +160 @@
 }
 
-WebSocketHandshake::WebSocketHandshake(const KURL& url, const String& protocol, ScriptExecutionContext* context)
+WebSocketHandshake::WebSocketHandshake(const KURL& url, const String& protocol, ScriptExecutionContext* context, bool useHixie76Protocol)
     : m_url(url)
     , m_clientProtocol(protocol)
     , m_secure(m_url.protocolIs("wss"))
     , m_context(context)
+    , m_useHixie76Protocol(useHixie76Protocol)
     , m_mode(Incomplete)
 {

trunk/Source/WebCore/websockets/WebSocketHandshake.h

@@ -49 +49 @@
             Incomplete, Normal, Failed, Connected
         };
-        WebSocketHandshake(const KURL&, const String& protocol, ScriptExecutionContext*);
+        WebSocketHandshake(const KURL&, const String& protocol, ScriptExecutionContext*, bool useHixie76Protocol);
         ~WebSocketHandshake();
 
@@ -98 +98 @@
         bool m_secure;
         ScriptExecutionContext* m_context;
+        bool m_useHixie76Protocol;
 
         Mode m_mode;