Changeset 150154 in webkit


Ignore:
Timestamp:
May 15, 2013 3:43:53 PM (11 years ago)
Author:
andersca@apple.com
Message:

Remove WebSocketHandshakeResponse class
​https://bugs.webkit.org/show_bug.cgi?id=116190

Reviewed by Andreas Kling.

Just use ResourceResponse instead of WebSocketHandshakeResponse.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Modules/websockets/WebSocketHandshake.cpp:

(WebCore::WebSocketHandshake::readServerHandshake):
(WebCore::WebSocketHandshake::serverWebSocketProtocol):
(WebCore::WebSocketHandshake::serverSetCookie):
(WebCore::WebSocketHandshake::serverSetCookie2):
(WebCore::WebSocketHandshake::serverUpgrade):
(WebCore::WebSocketHandshake::serverConnection):
(WebCore::WebSocketHandshake::serverWebSocketAccept):
(WebCore::WebSocketHandshake::serverHandshakeResponse):
(WebCore::WebSocketHandshake::readHTTPHeaders):

  • Modules/websockets/WebSocketHandshake.h:
  • Modules/websockets/WebSocketHandshakeResponse.cpp: Removed.
  • Modules/websockets/WebSocketHandshakeResponse.h: Removed.
  • Target.pri:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • inspector/InspectorInstrumentation.cpp:

(WebCore):
(WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl):

  • inspector/InspectorInstrumentation.h:

(InspectorInstrumentation):
(WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponse):

  • inspector/InspectorResourceAgent.cpp:

(WebCore::InspectorResourceAgent::didReceiveWebSocketHandshakeResponse):

  • inspector/InspectorResourceAgent.h:

(WebCore):
(InspectorResourceAgent):

Location:
trunk/Source/WebCore
Files:
2 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r150142 r150154  
    964964    Modules/websockets/WebSocketFrame.cpp
    965965    Modules/websockets/WebSocketHandshake.cpp
    966     Modules/websockets/WebSocketHandshakeResponse.cpp
    967966    Modules/websockets/WorkerThreadableWebSocketChannel.cpp
    968967

  • trunk/Source/WebCore/ChangeLog

    r150153 r150154  
     12013-05-15  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove WebSocketHandshakeResponse class
     4        https://bugs.webkit.org/show_bug.cgi?id=116190
     5
     6        Reviewed by Andreas Kling.
     7
     8        Just use ResourceResponse instead of WebSocketHandshakeResponse.
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * Modules/websockets/WebSocketHandshake.cpp:
     13        (WebCore::WebSocketHandshake::readServerHandshake):
     14        (WebCore::WebSocketHandshake::serverWebSocketProtocol):
     15        (WebCore::WebSocketHandshake::serverSetCookie):
     16        (WebCore::WebSocketHandshake::serverSetCookie2):
     17        (WebCore::WebSocketHandshake::serverUpgrade):
     18        (WebCore::WebSocketHandshake::serverConnection):
     19        (WebCore::WebSocketHandshake::serverWebSocketAccept):
     20        (WebCore::WebSocketHandshake::serverHandshakeResponse):
     21        (WebCore::WebSocketHandshake::readHTTPHeaders):
     22        * Modules/websockets/WebSocketHandshake.h:
     23        * Modules/websockets/WebSocketHandshakeResponse.cpp: Removed.
     24        * Modules/websockets/WebSocketHandshakeResponse.h: Removed.
     25        * Target.pri:
     26        * WebCore.vcproj/WebCore.vcproj:
     27        * WebCore.vcxproj/WebCore.vcxproj:
     28        * WebCore.vcxproj/WebCore.vcxproj.filters:
     29        * WebCore.xcodeproj/project.pbxproj:
     30        * inspector/InspectorInstrumentation.cpp:
     31        (WebCore):
     32        (WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl):
     33        * inspector/InspectorInstrumentation.h:
     34        (InspectorInstrumentation):
     35        (WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponse):
     36        * inspector/InspectorResourceAgent.cpp:
     37        (WebCore::InspectorResourceAgent::didReceiveWebSocketHandshakeResponse):
     38        * inspector/InspectorResourceAgent.h:
     39        (WebCore):
     40        (InspectorResourceAgent):
     41
    1422013-05-15  Eric Carlson  <eric.carlson@apple.com>
    243

  • trunk/Source/WebCore/GNUmakefile.list.am

    r150142 r150154  
    22602260        Source/WebCore/Modules/websockets/WebSocketHandshake.cpp \
    22612261        Source/WebCore/Modules/websockets/WebSocketHandshake.h \
    2262         Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.cpp \
    2263         Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.h \
    22642262        Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp \
    22652263        Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h

  • trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp

    r150142 r150154  
    300300    }
    301301    LOG(Network, "WebSocketHandshake %p readServerHandshake() Status code is %d", this, statusCode);
    302     m_response.setStatusCode(statusCode);
    303     m_response.setStatusText(statusText);
     302
     303    m_serverHandshakeResponse = ResourceResponse();
     304    m_serverHandshakeResponse.setHTTPStatusCode(statusCode);
     305    m_serverHandshakeResponse.setHTTPStatusText(statusText);
     306
    304307    if (statusCode != 101) {
    305308        m_mode = Failed;
    … …  
    341344String WebSocketHandshake::serverWebSocketProtocol() const
    342345{
    343     return m_response.headerFields().get("sec-websocket-protocol");
     346    return m_serverHandshakeResponse.httpHeaderFields().get("sec-websocket-protocol");
    344347}
    345348
    346349String WebSocketHandshake::serverSetCookie() const
    347350{
    348     return m_response.headerFields().get("set-cookie");
     351    return m_serverHandshakeResponse.httpHeaderFields().get("set-cookie");
    349352}
    350353
    351354String WebSocketHandshake::serverSetCookie2() const
    352355{
    353     return m_response.headerFields().get("set-cookie2");
     356    return m_serverHandshakeResponse.httpHeaderFields().get("set-cookie2");
    354357}
    355358
    356359String WebSocketHandshake::serverUpgrade() const
    357360{
    358     return m_response.headerFields().get("upgrade");
     361    return m_serverHandshakeResponse.httpHeaderFields().get("upgrade");
    359362}
    360363
    361364String WebSocketHandshake::serverConnection() const
    362365{
    363     return m_response.headerFields().get("connection");
     366    return m_serverHandshakeResponse.httpHeaderFields().get("connection");
    364367}
    365368
    366369String WebSocketHandshake::serverWebSocketAccept() const
    367370{
    368     return m_response.headerFields().get("sec-websocket-accept");
     371    return m_serverHandshakeResponse.httpHeaderFields().get("sec-websocket-accept");
    369372}
    370373
    … …  
    374377}
    375378
    376 const WebSocketHandshakeResponse& WebSocketHandshake::serverHandshakeResponse() const
    377 {
    378     return m_response;
     379const ResourceResponse& WebSocketHandshake::serverHandshakeResponse() const
     380{
     381    return m_serverHandshakeResponse;
    379382}
    380383
    … …  
    464467const char* WebSocketHandshake::readHTTPHeaders(const char* start, const char* end)
    465468{
    466     m_response.clearHeaderFields();
    467 
    468469    AtomicString name;
    469470    String value;
    … …  
    497498                return 0;
    498499            }
    499             m_response.addHeaderField(name, value);
     500            m_serverHandshakeResponse.addHTTPHeaderField(name, value);
    500501            sawSecWebSocketAcceptHeaderField = true;
    501502        } else if (equalIgnoringCase("Sec-WebSocket-Protocol", name)) {
    … …  
    504505                return 0;
    505506            }
    506             m_response.addHeaderField(name, value);
     507            m_serverHandshakeResponse.addHTTPHeaderField(name, value);
    507508            sawSecWebSocketProtocolHeaderField = true;
    508509        } else
    509             m_response.addHeaderField(name, value);
     510            m_serverHandshakeResponse.addHTTPHeaderField(name, value);
    510511    }
    511512    return p;

  • trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.h

    r150142 r150154  
    3535
    3636#include "KURL.h"
     37#include "ResourceResponse.h"
    3738#include "WebSocketExtensionDispatcher.h"
    3839#include "WebSocketExtensionProcessor.h"
    39 #include "WebSocketHandshakeResponse.h"
    4040#include <wtf/PassOwnPtr.h>
    4141#include <wtf/text/WTFString.h>
    … …  
    8585    String acceptedExtensions() const;
    8686
    87     const WebSocketHandshakeResponse& serverHandshakeResponse() const;
     87    const ResourceResponse& serverHandshakeResponse() const;
    8888
    8989    void addExtensionProcessor(PassOwnPtr<WebSocketExtensionProcessor>);
    … …  
    108108    Mode m_mode;
    109109
    110     WebSocketHandshakeResponse m_response;
     110    ResourceResponse m_serverHandshakeResponse;
    111111
    112112    String m_failureReason;

  • trunk/Source/WebCore/Target.pri

    r150142 r150154  
    40254025        Modules/websockets/WebSocketFrame.h \
    40264026        Modules/websockets/WebSocketHandshake.h \
    4027         Modules/websockets/WebSocketHandshakeResponse.h \
    40284027        Modules/websockets/WorkerThreadableWebSocketChannel.h \
    40294028        platform/network/qt/SocketStreamHandlePrivate.h
    … …  
    40384037        Modules/websockets/WebSocketFrame.cpp \
    40394038        Modules/websockets/WebSocketHandshake.cpp \
    4040         Modules/websockets/WebSocketHandshakeResponse.cpp \
    40414039        Modules/websockets/WorkerThreadableWebSocketChannel.cpp \
    40424040        Modules/websockets/ThreadableWebSocketChannel.cpp \

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r150142 r150154  
    2591125911                                </File>
    2591225912                                <File
    25913                                         RelativePath="..\Modules\websockets\WebSocketHandshakeResponse.cpp"
    25914                                         >
    25915                                 </File>
    25916                                 <File
    25917                                         RelativePath="..\Modules\websockets\WebSocketHandshakeResponse.h"
    25918                                         >
    25919                                 </File>
    25920                                 <File
    2592125913                                        RelativePath="..\Modules\websockets\WorkerThreadableWebSocketChannel.cpp"
    2592225914                                        >

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r150142 r150154  
    37113711    <ClCompile Include="..\Modules\websockets\WebSocketFrame.cpp" />
    37123712    <ClCompile Include="..\Modules\websockets\WebSocketHandshake.cpp" />
    3713     <ClCompile Include="..\Modules\websockets\WebSocketHandshakeResponse.cpp" />
    37143713    <ClCompile Include="..\Modules\websockets\WorkerThreadableWebSocketChannel.cpp" />
    37153714    <ClCompile Include="..\Modules\speech\DOMWindowSpeechSynthesis.cpp" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r150142 r150154  
    589589      <Filter>Modules\websockets</Filter>
    590590    </ClCompile>
    591     <ClCompile Include="..\Modules\websockets\WebSocketHandshakeResponse.cpp">
    592       <Filter>Modules\websockets</Filter>
    593     </ClCompile>
    594591    <ClCompile Include="..\Modules\websockets\WorkerThreadableWebSocketChannel.cpp">
    595592      <Filter>Modules\websockets</Filter>
    … …  
    72807277    </ClInclude>
    72817278    <ClInclude Include="..\Modules\websockets\WebSocketHandshake.h">
    7282       <Filter>Modules\websockets</Filter>
    7283     </ClInclude>
    7284     <ClInclude Include="..\Modules\websockets\WebSocketHandshakeResponse.h">
    72857279      <Filter>Modules\websockets</Filter>
    72867280    </ClInclude>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r150142 r150154  
    31983198                97AABD2614FA09D5007457AE /* WebSocketHandshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */; };
    31993199                97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */; };
    3200                 97AABD2A14FA09D5007457AE /* WebSocketHandshakeResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */; };
    3201                 97AABD2B14FA09D5007457AE /* WebSocketHandshakeResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */; };
    32023200                97AABD2C14FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */; };
    32033201                97AABD2D14FA09D5007457AE /* WorkerThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD1214FA09D5007457AE /* WorkerThreadableWebSocketChannel.h */; };
    … …  
    96569654                97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshake.cpp; path = Modules/websockets/WebSocketHandshake.cpp; sourceTree = "<group>"; };
    96579655                97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshake.h; path = Modules/websockets/WebSocketHandshake.h; sourceTree = "<group>"; };
    9658                 97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshakeResponse.cpp; path = Modules/websockets/WebSocketHandshakeResponse.cpp; sourceTree = "<group>"; };
    9659                 97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshakeResponse.h; path = Modules/websockets/WebSocketHandshakeResponse.h; sourceTree = "<group>"; };
    96609656                97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerThreadableWebSocketChannel.cpp; path = Modules/websockets/WorkerThreadableWebSocketChannel.cpp; sourceTree = "<group>"; };
    96619657                97AABD1214FA09D5007457AE /* WorkerThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerThreadableWebSocketChannel.h; path = Modules/websockets/WorkerThreadableWebSocketChannel.h; sourceTree = "<group>"; };
    … …  
    1640216398                                97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */,
    1640316399                                97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */,
    16404                                 97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */,
    16405                                 97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */,
    1640616400                                A886CDC214FBBAA300D279F4 /* WorkerContextWebSocket.idl */,
    1640716401                                97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */,
    … …  
    2399123985                                97AABD2514FA09D5007457AE /* WebSocketFrame.h in Headers */,
    2399223986                                97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */,
    23993                                 97AABD2B14FA09D5007457AE /* WebSocketHandshakeResponse.h in Headers */,
    2399423987                                0F580FA31496939100FB5BD8 /* WebTiledBackingLayer.h in Headers */,
    2399523988                                0FCF332D0F2B9A25004B6795 /* WebTiledLayer.h in Headers */,
    … …  
    2697626969                                AAF5B7B71524B6C50004CB49 /* WebSocketFrame.cpp in Sources */,
    2697726970                                97AABD2614FA09D5007457AE /* WebSocketHandshake.cpp in Sources */,
    26978                                 97AABD2A14FA09D5007457AE /* WebSocketHandshakeResponse.cpp in Sources */,
    2697926971                                0F580FA41496939100FB5BD8 /* WebTiledBackingLayer.mm in Sources */,
    2698026972                                0FCF332C0F2B9A25004B6795 /* WebTiledLayer.mm in Sources */,

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r150142 r150154  
    11691169}
    11701170
    1171 void InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const WebSocketHandshakeResponse& response, Document* document)
     1171void InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const ResourceResponse& response, Document* document)
    11721172{
    11731173    if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r150142 r150154  
    4545#include "StorageArea.h"
    4646#include "WebSocketFrame.h"
    47 #include "WebSocketHandshakeResponse.h"
    4847#include <wtf/RefPtr.h>
    4948
    … …  
    271270    static void didCreateWebSocket(Document*, unsigned long identifier, const KURL& requestURL, const KURL& documentURL, const String& protocol);
    272271    static void willSendWebSocketHandshakeRequest(Document*, unsigned long identifier, const ResourceRequest&);
    273     static void didReceiveWebSocketHandshakeResponse(Document*, unsigned long identifier, const WebSocketHandshakeResponse&);
     272    static void didReceiveWebSocketHandshakeResponse(Document*, unsigned long identifier, const ResourceResponse&);
    274273    static void didCloseWebSocket(Document*, unsigned long identifier);
    275274    static void didReceiveWebSocketFrame(Document*, unsigned long identifier, const WebSocketFrame&);
    … …  
    470469    static void didCreateWebSocketImpl(InstrumentingAgents*, unsigned long identifier, const KURL& requestURL, const KURL& documentURL, const String& protocol, Document*);
    471470    static void willSendWebSocketHandshakeRequestImpl(InstrumentingAgents*, unsigned long identifier, const ResourceRequest&, Document*);
    472     static void didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents*, unsigned long identifier, const WebSocketHandshakeResponse&, Document*);
     471    static void didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents*, unsigned long identifier, const ResourceResponse&, Document*);
    473472    static void didCloseWebSocketImpl(InstrumentingAgents*, unsigned long identifier, Document*);
    474473    static void didReceiveWebSocketFrameImpl(InstrumentingAgents*, unsigned long identifier, const WebSocketFrame&);
    … …  
    18601859}
    18611860
    1862 inline void InspectorInstrumentation::didReceiveWebSocketHandshakeResponse(Document* document, unsigned long identifier, const WebSocketHandshakeResponse& response)
     1861inline void InspectorInstrumentation::didReceiveWebSocketHandshakeResponse(Document* document, unsigned long identifier, const ResourceResponse& response)
    18631862{
    18641863#if ENABLE(INSPECTOR)

  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r150142 r150154  
    6868#include "SubresourceLoader.h"
    6969#include "WebSocketFrame.h"
    70 #include "WebSocketHandshakeResponse.h"
    7170#include "XMLHttpRequest.h"
    7271
    … …  
    494493}
    495494
    496 void InspectorResourceAgent::didReceiveWebSocketHandshakeResponse(unsigned long identifier, const WebSocketHandshakeResponse& response)
     495void InspectorResourceAgent::didReceiveWebSocketHandshakeResponse(unsigned long identifier, const ResourceResponse& response)
    497496{
    498497    RefPtr<TypeBuilder::Network::WebSocketResponse> responseObject = TypeBuilder::Network::WebSocketResponse::create()
    499         .setStatus(response.statusCode())
    500         .setStatusText(response.statusText())
    501         .setHeaders(buildObjectForHeaders(response.headerFields()));
     498        .setStatus(response.httpStatusCode())
     499        .setStatusText(response.httpStatusText())
     500        .setHeaders(buildObjectForHeaders(response.httpHeaderFields()));
    502501    m_frontend->webSocketHandshakeResponseReceived(IdentifiersFactory::requestId(identifier), currentTime(), responseObject);
    503502}

  • trunk/Source/WebCore/inspector/InspectorResourceAgent.h

    r150142 r150154  
    7575#if ENABLE(WEB_SOCKETS)
    7676struct WebSocketFrame;
    77 class WebSocketHandshakeResponse;
    7877#endif
    7978
    … …  
    128127    void didCreateWebSocket(unsigned long identifier, const KURL& requestURL);
    129128    void willSendWebSocketHandshakeRequest(unsigned long identifier, const ResourceRequest&);
    130     void didReceiveWebSocketHandshakeResponse(unsigned long identifier, const WebSocketHandshakeResponse&);
     129    void didReceiveWebSocketHandshakeResponse(unsigned long identifier, const ResourceResponse&);
    131130    void didCloseWebSocket(unsigned long identifier);
    132131    void didReceiveWebSocketFrame(unsigned long identifier, const WebSocketFrame&);
Note: See TracChangeset for help on using the changeset viewer.