Changeset 150142 in webkit


Ignore:
Timestamp:
May 15, 2013 1:22:29 PM (11 years ago)
Author:
andersca@apple.com
Message:

Remove WebSocketHandshakeRequest class
https://bugs.webkit.org/show_bug.cgi?id=116178

Reviewed by Andreas Kling.

Turns out WebSocketHandshakeRequest is just used by the web inspector, and there's no reason
why we can't just use a ResourceRequest instead.

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

(WebCore::WebSocketChannel::didOpenSocketStream):

  • Modules/websockets/WebSocketHandshake.cpp:

(WebCore::WebSocketHandshake::clientHandshakeRequest):

  • Modules/websockets/WebSocketHandshake.h:

(WebCore):

  • Modules/websockets/WebSocketHandshakeRequest.cpp: Removed.
  • Modules/websockets/WebSocketHandshakeRequest.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::willSendWebSocketHandshakeRequestImpl):

  • inspector/InspectorInstrumentation.h:

(InspectorInstrumentation):
(WebCore::InspectorInstrumentation::willSendWebSocketHandshakeRequest):

  • inspector/InspectorResourceAgent.cpp:

(WebCore::InspectorResourceAgent::willSendWebSocketHandshakeRequest):

  • inspector/InspectorResourceAgent.h:

(WebCore):
(InspectorResourceAgent):

  • platform/network/HTTPRequest.cpp:

(WebCore):

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

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r150062 r150142  
    964964    Modules/websockets/WebSocketFrame.cpp
    965965    Modules/websockets/WebSocketHandshake.cpp
    966     Modules/websockets/WebSocketHandshakeRequest.cpp
    967966    Modules/websockets/WebSocketHandshakeResponse.cpp
    968967    Modules/websockets/WorkerThreadableWebSocketChannel.cpp
  • trunk/Source/WebCore/ChangeLog

    r150141 r150142  
     12013-05-15  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove WebSocketHandshakeRequest class
     4        https://bugs.webkit.org/show_bug.cgi?id=116178
     5
     6        Reviewed by Andreas Kling.
     7
     8        Turns out WebSocketHandshakeRequest is just used by the web inspector, and there's no reason
     9        why we can't just use a ResourceRequest instead.
     10
     11        * CMakeLists.txt:
     12        * GNUmakefile.list.am:
     13        * Modules/websockets/WebSocketChannel.cpp:
     14        (WebCore::WebSocketChannel::didOpenSocketStream):
     15        * Modules/websockets/WebSocketHandshake.cpp:
     16        (WebCore::WebSocketHandshake::clientHandshakeRequest):
     17        * Modules/websockets/WebSocketHandshake.h:
     18        (WebCore):
     19        * Modules/websockets/WebSocketHandshakeRequest.cpp: Removed.
     20        * Modules/websockets/WebSocketHandshakeRequest.h: Removed.
     21        * Target.pri:
     22        * WebCore.vcproj/WebCore.vcproj:
     23        * WebCore.vcxproj/WebCore.vcxproj:
     24        * WebCore.vcxproj/WebCore.vcxproj.filters:
     25        * WebCore.xcodeproj/project.pbxproj:
     26        * inspector/InspectorInstrumentation.cpp:
     27        (WebCore):
     28        (WebCore::InspectorInstrumentation::willSendWebSocketHandshakeRequestImpl):
     29        * inspector/InspectorInstrumentation.h:
     30        (InspectorInstrumentation):
     31        (WebCore::InspectorInstrumentation::willSendWebSocketHandshakeRequest):
     32        * inspector/InspectorResourceAgent.cpp:
     33        (WebCore::InspectorResourceAgent::willSendWebSocketHandshakeRequest):
     34        * inspector/InspectorResourceAgent.h:
     35        (WebCore):
     36        (InspectorResourceAgent):
     37        * platform/network/HTTPRequest.cpp:
     38        (WebCore):
     39
    1402013-05-15  Darin Adler  <darin@apple.com>
    241
  • trunk/Source/WebCore/GNUmakefile.list.am

    r150074 r150142  
    22602260        Source/WebCore/Modules/websockets/WebSocketHandshake.cpp \
    22612261        Source/WebCore/Modules/websockets/WebSocketHandshake.h \
    2262         Source/WebCore/Modules/websockets/WebSocketHandshakeRequest.cpp \
    2263         Source/WebCore/Modules/websockets/WebSocketHandshakeRequest.h \
    22642262        Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.cpp \
    22652263        Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.h \
  • trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp

    r147938 r150142  
    4848#include "Page.h"
    4949#include "ProgressTracker.h"
     50#include "ResourceRequest.h"
    5051#include "ScriptCallStack.h"
    5152#include "ScriptExecutionContext.h"
     
    258259        return;
    259260    if (m_identifier)
    260         InspectorInstrumentation::willSendWebSocketHandshakeRequest(m_document, m_identifier, *m_handshake->clientHandshakeRequest());
     261        InspectorInstrumentation::willSendWebSocketHandshakeRequest(m_document, m_identifier, m_handshake->clientHandshakeRequest());
    261262    CString handshakeMessage = m_handshake->clientHandshakeMessage();
    262263    if (!handle->send(handshakeMessage.data(), handshakeMessage.length()))
  • trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp

    r149120 r150142  
    4444#include "KURL.h"
    4545#include "Logging.h"
     46#include "ResourceRequest.h"
    4647#include "ScriptCallStack.h"
    4748#include "ScriptExecutionContext.h"
     
    237238}
    238239
    239 PassRefPtr<WebSocketHandshakeRequest> WebSocketHandshake::clientHandshakeRequest() const
     240ResourceRequest WebSocketHandshake::clientHandshakeRequest() const
    240241{
    241242    // Keep the following consistent with clientHandshakeMessage().
    242243    // FIXME: do we need to store m_secWebSocketKey1, m_secWebSocketKey2 and
    243     // m_key3 in WebSocketHandshakeRequest?
    244     RefPtr<WebSocketHandshakeRequest> request = WebSocketHandshakeRequest::create("GET", m_url);
    245     request->addHeaderField("Upgrade", "websocket");
    246     request->addHeaderField("Connection", "Upgrade");
    247     request->addHeaderField("Host", hostName(m_url, m_secure));
    248     request->addHeaderField("Origin", clientOrigin());
     244    // m_key3 in the request?
     245    ResourceRequest request(m_url);
     246    request.setHTTPMethod("GET");
     247
     248    request.addHTTPHeaderField("Connection", "Upgrade");
     249    request.addHTTPHeaderField("Host", hostName(m_url, m_secure));
     250    request.addHTTPHeaderField("Origin", clientOrigin());
    249251    if (!m_clientProtocol.isEmpty())
    250         request->addHeaderField("Sec-WebSocket-Protocol", m_clientProtocol);
     252        request.addHTTPHeaderField("Sec-WebSocket-Protocol", m_clientProtocol);
    251253
    252254    KURL url = httpURLForAuthenticationAndCookies();
     
    255257        String cookie = cookieRequestHeaderFieldValue(document, url);
    256258        if (!cookie.isEmpty())
    257             request->addHeaderField("Cookie", cookie);
     259            request.addHTTPHeaderField("Cookie", cookie);
    258260        // Set "Cookie2: <cookie>" if cookies 2 exists for url?
    259261    }
    260262
    261     request->addHeaderField("Pragma", "no-cache");
    262     request->addHeaderField("Cache-Control", "no-cache");
    263 
    264     request->addHeaderField("Sec-WebSocket-Key", m_secWebSocketKey);
    265     request->addHeaderField("Sec-WebSocket-Version", "13");
     263    request.addHTTPHeaderField("Pragma", "no-cache");
     264    request.addHTTPHeaderField("Cache-Control", "no-cache");
     265
     266    request.addHTTPHeaderField("Sec-WebSocket-Key", m_secWebSocketKey);
     267    request.addHTTPHeaderField("Sec-WebSocket-Version", "13");
    266268    const String extensionValue = m_extensionDispatcher.createHeaderValue();
    267269    if (extensionValue.length())
    268         request->addHeaderField("Sec-WebSocket-Extensions", extensionValue);
     270        request.addHTTPHeaderField("Sec-WebSocket-Extensions", extensionValue);
    269271
    270272    // Add a User-Agent header.
    271     request->addHeaderField("User-Agent", m_context->userAgent(m_context->url()));
    272 
    273     return request.release();
     273    request.addHTTPHeaderField("User-Agent", m_context->userAgent(m_context->url()));
     274
     275    return request;
    274276}
    275277
  • trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.h

    r128572 r150142  
    3737#include "WebSocketExtensionDispatcher.h"
    3838#include "WebSocketExtensionProcessor.h"
    39 #include "WebSocketHandshakeRequest.h"
    4039#include "WebSocketHandshakeResponse.h"
    4140#include <wtf/PassOwnPtr.h>
     
    4443namespace WebCore {
    4544
     45class ResourceRequest;
    4646class ScriptExecutionContext;
    4747
     
    6868
    6969    CString clientHandshakeMessage() const;
    70     PassRefPtr<WebSocketHandshakeRequest> clientHandshakeRequest() const;
     70    ResourceRequest clientHandshakeRequest() const;
    7171
    7272    void reset();
  • trunk/Source/WebCore/Target.pri

    r150045 r150142  
    40254025        Modules/websockets/WebSocketFrame.h \
    40264026        Modules/websockets/WebSocketHandshake.h \
    4027         Modules/websockets/WebSocketHandshakeRequest.h \
    40284027        Modules/websockets/WebSocketHandshakeResponse.h \
    40294028        Modules/websockets/WorkerThreadableWebSocketChannel.h \
     
    40394038        Modules/websockets/WebSocketFrame.cpp \
    40404039        Modules/websockets/WebSocketHandshake.cpp \
    4041         Modules/websockets/WebSocketHandshakeRequest.cpp \
    40424040        Modules/websockets/WebSocketHandshakeResponse.cpp \
    40434041        Modules/websockets/WorkerThreadableWebSocketChannel.cpp \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r150053 r150142  
    2591125911                                </File>
    2591225912                                <File
    25913                                         RelativePath="..\Modules\websockets\WebSocketHandshakeRequest.cpp"
    25914                                         >
    25915                                 </File>
    25916                                 <File
    25917                                         RelativePath="..\Modules\websockets\WebSocketHandshakeRequest.h"
    25918                                         >
    25919                                 </File>
    25920                                 <File
    2592125913                                        RelativePath="..\Modules\websockets\WebSocketHandshakeResponse.cpp"
    2592225914                                        >
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r150053 r150142  
    37113711    <ClCompile Include="..\Modules\websockets\WebSocketFrame.cpp" />
    37123712    <ClCompile Include="..\Modules\websockets\WebSocketHandshake.cpp" />
    3713     <ClCompile Include="..\Modules\websockets\WebSocketHandshakeRequest.cpp" />
    37143713    <ClCompile Include="..\Modules\websockets\WebSocketHandshakeResponse.cpp" />
    37153714    <ClCompile Include="..\Modules\websockets\WorkerThreadableWebSocketChannel.cpp" />
     
    1130911308    <ClInclude Include="..\Modules\websockets\WebSocketFrame.h" />
    1131011309    <ClInclude Include="..\Modules\websockets\WebSocketHandshake.h" />
    11311     <ClInclude Include="..\Modules\websockets\WebSocketHandshakeRequest.h" />
    11312     <ClInclude Include="..\Modules\websockets\WebSocketHandshakeResponse.h" />
    1131311310    <ClInclude Include="..\Modules\websockets\WorkerThreadableWebSocketChannel.h" />
    1131411311    <ClInclude Include="..\Modules\speech\DOMWindowSpeechSynthesis.h" />
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r150053 r150142  
    589589      <Filter>Modules\websockets</Filter>
    590590    </ClCompile>
    591     <ClCompile Include="..\Modules\websockets\WebSocketHandshakeRequest.cpp">
    592       <Filter>Modules\websockets</Filter>
    593     </ClCompile>
    594591    <ClCompile Include="..\Modules\websockets\WebSocketHandshakeResponse.cpp">
    595592      <Filter>Modules\websockets</Filter>
     
    72837280    </ClInclude>
    72847281    <ClInclude Include="..\Modules\websockets\WebSocketHandshake.h">
    7285       <Filter>Modules\websockets</Filter>
    7286     </ClInclude>
    7287     <ClInclude Include="..\Modules\websockets\WebSocketHandshakeRequest.h">
    72887282      <Filter>Modules\websockets</Filter>
    72897283    </ClInclude>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r150129 r150142  
    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                 97AABD2814FA09D5007457AE /* WebSocketHandshakeRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0D14FA09D5007457AE /* WebSocketHandshakeRequest.cpp */; };
    3201                 97AABD2914FA09D5007457AE /* WebSocketHandshakeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0E14FA09D5007457AE /* WebSocketHandshakeRequest.h */; };
    32023200                97AABD2A14FA09D5007457AE /* WebSocketHandshakeResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */; };
    32033201                97AABD2B14FA09D5007457AE /* WebSocketHandshakeResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */; };
     
    96589656                97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshake.cpp; path = Modules/websockets/WebSocketHandshake.cpp; sourceTree = "<group>"; };
    96599657                97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshake.h; path = Modules/websockets/WebSocketHandshake.h; sourceTree = "<group>"; };
    9660                 97AABD0D14FA09D5007457AE /* WebSocketHandshakeRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshakeRequest.cpp; path = Modules/websockets/WebSocketHandshakeRequest.cpp; sourceTree = "<group>"; };
    9661                 97AABD0E14FA09D5007457AE /* WebSocketHandshakeRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshakeRequest.h; path = Modules/websockets/WebSocketHandshakeRequest.h; sourceTree = "<group>"; };
    96629658                97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshakeResponse.cpp; path = Modules/websockets/WebSocketHandshakeResponse.cpp; sourceTree = "<group>"; };
    96639659                97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshakeResponse.h; path = Modules/websockets/WebSocketHandshakeResponse.h; sourceTree = "<group>"; };
     
    1640616402                                97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */,
    1640716403                                97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */,
    16408                                 97AABD0D14FA09D5007457AE /* WebSocketHandshakeRequest.cpp */,
    16409                                 97AABD0E14FA09D5007457AE /* WebSocketHandshakeRequest.h */,
    1641016404                                97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */,
    1641116405                                97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */,
     
    2399723991                                97AABD2514FA09D5007457AE /* WebSocketFrame.h in Headers */,
    2399823992                                97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */,
    23999                                 97AABD2914FA09D5007457AE /* WebSocketHandshakeRequest.h in Headers */,
    2400023993                                97AABD2B14FA09D5007457AE /* WebSocketHandshakeResponse.h in Headers */,
    2400123994                                0F580FA31496939100FB5BD8 /* WebTiledBackingLayer.h in Headers */,
     
    2698326976                                AAF5B7B71524B6C50004CB49 /* WebSocketFrame.cpp in Sources */,
    2698426977                                97AABD2614FA09D5007457AE /* WebSocketHandshake.cpp in Sources */,
    26985                                 97AABD2814FA09D5007457AE /* WebSocketHandshakeRequest.cpp in Sources */,
    2698626978                                97AABD2A14FA09D5007457AE /* WebSocketHandshakeResponse.cpp in Sources */,
    2698726979                                0F580FA41496939100FB5BD8 /* WebTiledBackingLayer.mm in Sources */,
  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r149125 r150142  
    11611161}
    11621162
    1163 void InspectorInstrumentation::willSendWebSocketHandshakeRequestImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const WebSocketHandshakeRequest& request, Document* document)
     1163void InspectorInstrumentation::willSendWebSocketHandshakeRequestImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const ResourceRequest& request, Document* document)
    11641164{
    11651165    if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r149980 r150142  
    4545#include "StorageArea.h"
    4646#include "WebSocketFrame.h"
    47 #include "WebSocketHandshakeRequest.h"
    4847#include "WebSocketHandshakeResponse.h"
    4948#include <wtf/RefPtr.h>
     
    271270#if ENABLE(WEB_SOCKETS)
    272271    static void didCreateWebSocket(Document*, unsigned long identifier, const KURL& requestURL, const KURL& documentURL, const String& protocol);
    273     static void willSendWebSocketHandshakeRequest(Document*, unsigned long identifier, const WebSocketHandshakeRequest&);
     272    static void willSendWebSocketHandshakeRequest(Document*, unsigned long identifier, const ResourceRequest&);
    274273    static void didReceiveWebSocketHandshakeResponse(Document*, unsigned long identifier, const WebSocketHandshakeResponse&);
    275274    static void didCloseWebSocket(Document*, unsigned long identifier);
     
    470469#if ENABLE(WEB_SOCKETS)
    471470    static void didCreateWebSocketImpl(InstrumentingAgents*, unsigned long identifier, const KURL& requestURL, const KURL& documentURL, const String& protocol, Document*);
    472     static void willSendWebSocketHandshakeRequestImpl(InstrumentingAgents*, unsigned long identifier, const WebSocketHandshakeRequest&, Document*);
     471    static void willSendWebSocketHandshakeRequestImpl(InstrumentingAgents*, unsigned long identifier, const ResourceRequest&, Document*);
    473472    static void didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents*, unsigned long identifier, const WebSocketHandshakeResponse&, Document*);
    474473    static void didCloseWebSocketImpl(InstrumentingAgents*, unsigned long identifier, Document*);
     
    18491848}
    18501849
    1851 inline void InspectorInstrumentation::willSendWebSocketHandshakeRequest(Document* document, unsigned long identifier, const WebSocketHandshakeRequest& request)
     1850inline void InspectorInstrumentation::willSendWebSocketHandshakeRequest(Document* document, unsigned long identifier, const ResourceRequest& request)
    18521851{
    18531852#if ENABLE(INSPECTOR)
  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r149905 r150142  
    6868#include "SubresourceLoader.h"
    6969#include "WebSocketFrame.h"
    70 #include "WebSocketHandshakeRequest.h"
    7170#include "WebSocketHandshakeResponse.h"
    7271#include "XMLHttpRequest.h"
     
    488487}
    489488
    490 void InspectorResourceAgent::willSendWebSocketHandshakeRequest(unsigned long identifier, const WebSocketHandshakeRequest& request)
     489void InspectorResourceAgent::willSendWebSocketHandshakeRequest(unsigned long identifier, const ResourceRequest& request)
    491490{
    492491    RefPtr<TypeBuilder::Network::WebSocketRequest> requestObject = TypeBuilder::Network::WebSocketRequest::create()
    493         .setHeaders(buildObjectForHeaders(request.headerFields()));
     492        .setHeaders(buildObjectForHeaders(request.httpHeaderFields()));
    494493    m_frontend->webSocketWillSendHandshakeRequest(IdentifiersFactory::requestId(identifier), currentTime(), requestObject);
    495494}
  • trunk/Source/WebCore/inspector/InspectorResourceAgent.h

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