Changeset 64142 in webkit

Timestamp:

Jul 27, 2010 11:14:31 AM (14 years ago)

Author:

victorw@chromium.org

Message:

2010-07-27 Victor Wang <​victorw@chromium.org>

Unreviewed, rolling out r64104.
​http://trac.webkit.org/changeset/64104
​https://bugs.webkit.org/show_bug.cgi?id=40768

The patch causes chromium webkit socket laytest crashes on
windows randomly

• inspector/InspectorController.cpp: (WebCore::InspectorController::addResource): (WebCore::InspectorController::removeResource):
• inspector/InspectorController.h:
• inspector/InspectorResource.cpp: (WebCore::InspectorResource::InspectorResource): (WebCore::InspectorResource::updateScriptObject): (WebCore::InspectorResource::cachedResource): (WebCore::InspectorResource::type): (WebCore::InspectorResource::resourceData):
• inspector/InspectorResource.h: (WebCore::InspectorResource::): (WebCore::InspectorResource::create):
• inspector/front-end/Resource.js: (WebInspector.Resource.Type.toString): (WebInspector.Resource.prototype.set type): (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):
• inspector/front-end/ResourceView.js: (WebInspector.ResourceView.prototype._refreshRequestHeaders): (WebInspector.ResourceView.prototype._refreshResponseHeaders): (WebInspector.ResourceView.prototype._refreshHeaders):
• inspector/front-end/inspector.css: (.resources-category-scripts, .resources-category-xhr, .resources-category-fonts, .resources-category-other):
• inspector/front-end/inspector.js: (WebInspector.loaded): (WebInspector.updateResource):
• websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::WebSocketChannel): (WebCore::WebSocketChannel::disconnect): (WebCore::WebSocketChannel::didOpen): (WebCore::WebSocketChannel::didClose): (WebCore::WebSocketChannel::processBuffer):
• websockets/WebSocketChannel.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (3 diffs)
• inspector/InspectorController.h (modified) (2 diffs)
• inspector/InspectorResource.cpp (modified) (11 diffs)
• inspector/InspectorResource.h (modified) (6 diffs)
• inspector/front-end/Resource.js (modified) (4 diffs)
• inspector/front-end/ResourceView.js (modified) (4 diffs)
• inspector/front-end/inspector.css (modified) (3 diffs)
• inspector/front-end/inspector.js (modified) (3 diffs)
• websockets/WebSocketChannel.cpp (modified) (7 diffs)
• websockets/WebSocketChannel.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-27  Victor Wang  <victorw@chromium.org>
+
+        Unreviewed, rolling out r64104.
+        http://trac.webkit.org/changeset/64104
+        https://bugs.webkit.org/show_bug.cgi?id=40768
+
+        The patch causes chromium webkit socket laytest crashes on
+        windows randomly
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::addResource):
+        (WebCore::InspectorController::removeResource):
+        * inspector/InspectorController.h:
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::InspectorResource):
+        (WebCore::InspectorResource::updateScriptObject):
+        (WebCore::InspectorResource::cachedResource):
+        (WebCore::InspectorResource::type):
+        (WebCore::InspectorResource::resourceData):
+        * inspector/InspectorResource.h:
+        (WebCore::InspectorResource::):
+        (WebCore::InspectorResource::create):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.Type.toString):
+        (WebInspector.Resource.prototype.set type):
+        (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):
+        * inspector/front-end/ResourceView.js:
+        (WebInspector.ResourceView.prototype._refreshRequestHeaders):
+        (WebInspector.ResourceView.prototype._refreshResponseHeaders):
+        (WebInspector.ResourceView.prototype._refreshHeaders):
+        * inspector/front-end/inspector.css:
+        (.resources-category-scripts, .resources-category-xhr, .resources-category-fonts, .resources-category-other):
+        * inspector/front-end/inspector.js:
+        (WebInspector.loaded):
+        (WebInspector.updateResource):
+        * websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::WebSocketChannel):
+        (WebCore::WebSocketChannel::disconnect):
+        (WebCore::WebSocketChannel::didOpen):
+        (WebCore::WebSocketChannel::didClose):
+        (WebCore::WebSocketChannel::processBuffer):
+        * websockets/WebSocketChannel.h:
+
 2010-07-27  Andrei Popescu  <andreip@google.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -827 +827 @@
 
     Frame* frame = resource->frame();
-    if (!frame)
-        return;
     ResourcesMap* resourceMap = m_frameResources.get(frame);
     if (resourceMap)
@@ -847 +845 @@
 
     Frame* frame = resource->frame();
-    if (!frame)
-        return;
     ResourcesMap* resourceMap = m_frameResources.get(frame);
     if (!resourceMap) {
@@ -1491 +1487 @@
 }
 #endif
-
-#if ENABLE(WEB_SOCKETS)
-void InspectorController::didCreateWebSocket(unsigned long identifier, const KURL& requestURL, const KURL& documentURL)
-{
-    if (!enabled())
-        return;
-    ASSERT(m_inspectedPage);
-
-    RefPtr<InspectorResource> resource = InspectorResource::createWebSocket(identifier, requestURL, documentURL);
-    addResource(resource.get());
-
-    if (m_frontend)
-        resource->updateScriptObject(m_frontend.get());
-}
-
-void InspectorController::willSendWebSocketHandshakeRequest(unsigned long identifier, const WebSocketHandshakeRequest& request)
-{
-    RefPtr<InspectorResource> resource = getTrackedResource(identifier);
-    if (!resource)
-        return;
-    resource->startTiming();
-    resource->updateWebSocketRequest(request);
-    if (m_frontend)
-        resource->updateScriptObject(m_frontend.get());
-}
-
-void InspectorController::didReceiveWebSocketHandshakeResponse(unsigned long identifier, const WebSocketHandshakeResponse& response)
-{
-    RefPtr<InspectorResource> resource = getTrackedResource(identifier);
-    if (!resource)
-        return;
-    // Calling resource->markResponseReceivedTime() here makes resources bar chart confusing, because
-    // we cannot apply the "latency + download" model of regular resources to WebSocket connections.
-    // FIXME: Design a new UI for bar charts of WebSocket resources, and record timing here.
-    resource->updateWebSocketResponse(response);
-    if (m_frontend)
-        resource->updateScriptObject(m_frontend.get());
-}
-
-void InspectorController::didCloseWebSocket(unsigned long identifier)
-{
-    RefPtr<InspectorResource> resource = getTrackedResource(identifier);
-    if (!resource)
-        return;
-
-    resource->endTiming();
-    if (m_frontend)
-        resource->updateScriptObject(m_frontend.get());
-}
-#endif // ENABLE(WEB_SOCKETS)
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)

trunk/WebCore/inspector/InspectorController.h

@@ -93 +93 @@
 #endif
 
-#if ENABLE(WEB_SOCKETS)
-class WebSocketHandshakeRequest;
-class WebSocketHandshakeResponse;
-#endif
-
 class InspectorController
 #if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -229 +224 @@
     void removeDOMStorageItem(long callId, long storageId, const String& key);
 #endif
-#if ENABLE(WEB_SOCKETS)
-    void didCreateWebSocket(unsigned long identifier, const KURL& requestURL, const KURL& documentURL);
-    void willSendWebSocketHandshakeRequest(unsigned long identifier, const WebSocketHandshakeRequest&);
-    void didReceiveWebSocketHandshakeResponse(unsigned long identifier, const WebSocketHandshakeResponse&);
-    void didCloseWebSocket(unsigned long identifier);
-#endif
 
     const ResourcesMap& resources() const { return m_resources; }

trunk/WebCore/inspector/InspectorResource.cpp

@@ -43 +43 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#include "StringBuffer.h"
 #include "TextEncoding.h"
 #include "ScriptObject.h"
-#include "WebSocketHandshakeRequest.h"
-#include "WebSocketHandshakeResponse.h"
-
-#include <wtf/Assertions.h>
 
 namespace WebCore {
-
-// Create human-readable binary representation, like "01:23:45:67:89:AB:CD:EF".
-static String createReadableStringFromBinary(const unsigned char* value, size_t length)
-{
-    ASSERT(length > 0);
-    static const char hexDigits[17] = "0123456789ABCDEF";
-    size_t bufferSize = length * 3 - 1;
-    StringBuffer buffer(bufferSize);
-    size_t index = 0;
-    for (size_t i = 0; i < length; ++i) {
-        if (i > 0)
-            buffer[index++] = ':';
-        buffer[index++] = hexDigits[value[i] >> 4];
-        buffer[index++] = hexDigits[value[i] & 0xF];
-    }
-    ASSERT(index == bufferSize);
-    return String::adopt(buffer);
-}
 
 InspectorResource::InspectorResource(unsigned long identifier, DocumentLoader* loader, const KURL& requestURL)
     : m_identifier(identifier)
     , m_loader(loader)
-    , m_frame(loader ? loader->frame() : 0)
+    , m_frame(loader->frame())
     , m_requestURL(requestURL)
     , m_expectedContentLength(0)
@@ -90 +67 @@
     , m_connectionReused(false)
     , m_isMainResource(false)
-#if ENABLE(WEB_SOCKETS)
-    , m_isWebSocket(false)
-#endif
 {
 }
@@ -115 +89 @@
 }
 
-PassRefPtr<InspectorResource> InspectorResource::create(unsigned long identifier, DocumentLoader* loader, const KURL& requestURL)
-{
-    ASSERT(loader);
-    return adoptRef(new InspectorResource(identifier, loader, requestURL));
-}
-
 PassRefPtr<InspectorResource> InspectorResource::createCached(unsigned long identifier, DocumentLoader* loader, const CachedResource* cachedResource)
 {
@@ -139 +107 @@
     return resource;
 }
-
-#if ENABLE(WEB_SOCKETS)
-PassRefPtr<InspectorResource> InspectorResource::createWebSocket(unsigned long identifier, const KURL& requestURL, const KURL& documentURL)
-{
-    RefPtr<InspectorResource> resource = adoptRef(new InspectorResource(identifier, 0, requestURL));
-    resource->markWebSocket();
-    resource->m_documentURL = documentURL;
-    return resource.release();
-}
-#endif
 
 void InspectorResource::updateRequest(const ResourceRequest& request)
@@ -189 +147 @@
 }
 
-#if ENABLE(WEB_SOCKETS)
-void InspectorResource::updateWebSocketRequest(const WebSocketHandshakeRequest& request)
-{
-    m_requestHeaderFields = request.headerFields();
-    m_requestMethod = "GET"; // Currently we always use "GET" to request handshake.
-    m_webSocketRequestKey3.set(new WebSocketHandshakeRequest::Key3(request.key3()));
-    m_changes.set(RequestChange);
-    m_changes.set(TypeChange);
-}
-
-void InspectorResource::updateWebSocketResponse(const WebSocketHandshakeResponse& response)
-{
-    m_responseStatusCode = response.statusCode();
-    m_responseStatusText = response.statusText();
-    m_responseHeaderFields = response.headerFields();
-    m_webSocketChallengeResponse.set(new WebSocketHandshakeResponse::ChallengeResponse(response.challengeResponse()));
-    m_changes.set(ResponseChange);
-    m_changes.set(TypeChange);
-}
-#endif // ENABLE(WEB_SOCKETS)
-
 static void populateHeadersObject(ScriptObject* object, const HTTPHeaderMap& headers)
 {
@@ -225 +162 @@
     ScriptObject jsonObject = frontend->newScriptObject();
     if (m_changes.hasChange(RequestChange)) {
-        if (m_frame)
-            m_documentURL = m_frame->document()->url();
-
         jsonObject.set("url", m_requestURL.string());
-        jsonObject.set("documentURL", m_documentURL.string());
+        jsonObject.set("documentURL", m_frame->document()->url().string());
         jsonObject.set("host", m_requestURL.host());
         jsonObject.set("path", m_requestURL.path());
@@ -240 +174 @@
         jsonObject.set("requestFormData", m_requestFormData);
         jsonObject.set("didRequestChange", true);
-#if ENABLE(WEB_SOCKETS)
-        if (m_webSocketRequestKey3)
-            jsonObject.set("webSocketRequestKey3", createReadableStringFromBinary(m_webSocketRequestKey3->value, sizeof(m_webSocketRequestKey3->value)));
-#endif
     }
 
@@ -260 +190 @@
         if (m_loadTiming && !m_cached)
             jsonObject.set("timing", buildObjectForTiming(frontend, m_loadTiming.get()));
-#if ENABLE(WEB_SOCKETS)
-        if (m_webSocketChallengeResponse)
-            jsonObject.set("webSocketChallengeResponse", createReadableStringFromBinary(m_webSocketChallengeResponse->value, sizeof(m_webSocketChallengeResponse->value)));
-#endif
         jsonObject.set("didResponseChange", true);
     }
@@ -322 +248 @@
     // but Inspector will already try to fetch data that is only available via CachedResource (and it won't update once the resource is added,
     // because m_changes will not have the appropriate bits set).
-    if (!m_frame)
-        return 0;
     const String& url = m_requestURL.string();
     CachedResource* cachedResource = m_frame->document()->docLoader()->cachedResource(url);
@@ -360 +284 @@
         return m_overrideContentType;
 
-#if ENABLE(WEB_SOCKETS)
-    if (m_isWebSocket)
-        return WebSocket;
-#endif
-
-    ASSERT(m_loader);
     if (m_requestURL == m_loader->requestURL()) {
         InspectorResource::Type resourceType = cachedResourceType();
@@ -405 +323 @@
 PassRefPtr<SharedBuffer> InspectorResource::resourceData(String* textEncodingName) const
 {
-    if (m_loader && m_requestURL == m_loader->requestURL()) {
+    if (m_requestURL == m_loader->requestURL()) {
         *textEncodingName = m_frame->document()->inputEncoding();
         return m_loader->mainResourceData();

trunk/WebCore/inspector/InspectorResource.h

@@ -37 +37 @@
 #include "ScriptState.h"
 #include "ScriptString.h"
-#include "WebSocketHandshakeRequest.h"
-#include "WebSocketHandshakeResponse.h"
 
 #include <wtf/CurrentTime.h>
@@ -56 +54 @@
     class ResourceResponse;
 
-#if ENABLE(WEB_SOCKETS)
-    class WebSocketHandshakeRequest;
-    class WebSocketHandshakeResponse;
-#endif
-
     class InspectorResource : public RefCounted<InspectorResource> {
     public:
@@ -73 +66 @@
             XHR,
             Media,
-            WebSocket,
             Other
         };
 
-        static PassRefPtr<InspectorResource> create(unsigned long identifier, DocumentLoader* loader, const KURL& requestURL);
+        static PassRefPtr<InspectorResource> create(unsigned long identifier, DocumentLoader* loader, const KURL& requestURL)
+        {
+            return adoptRef(new InspectorResource(identifier, loader, requestURL));
+        }
 
         static PassRefPtr<InspectorResource> createCached(unsigned long identifier, DocumentLoader*, const CachedResource*);
-
-#if ENABLE(WEB_SOCKETS)
-        // WebSocket resource doesn't have its loader. For WebSocket resources, m_loader and m_frame will become null.
-        static PassRefPtr<InspectorResource> createWebSocket(unsigned long identifier, const KURL& requestURL, const KURL& documentURL);
-#endif
 
         ~InspectorResource();
@@ -94 +84 @@
         void updateRequest(const ResourceRequest&);
         void updateResponse(const ResourceResponse&);
-
-#if ENABLE(WEB_SOCKETS)
-        void updateWebSocketRequest(const WebSocketHandshakeRequest&);
-        void updateWebSocketResponse(const WebSocketHandshakeResponse&);
-#endif
 
         void setOverrideContent(const ScriptString& data, Type);
@@ -169 +154 @@
         ScriptObject buildObjectForTiming(InspectorFrontend*, ResourceLoadTiming*);
 
-#if ENABLE(WEB_SOCKETS)
-        void markWebSocket() { m_isWebSocket = true; }
-#endif
-
         unsigned long m_identifier;
         RefPtr<DocumentLoader> m_loader;
         RefPtr<Frame> m_frame;
         KURL m_requestURL;
-        KURL m_documentURL;
         HTTPHeaderMap m_requestHeaderFields;
         HTTPHeaderMap m_responseHeaderFields;
@@ -204 +184 @@
         String m_requestFormData;
         Vector<RefPtr<InspectorResource> > m_redirects;
-
-#if ENABLE(WEB_SOCKETS)
-        bool m_isWebSocket;
-
-        // The following fields are not used for resources other than WebSocket.
-        // We allocate them dynamically to reduce memory consumption for regular resources.
-        OwnPtr<WebSocketHandshakeRequest::Key3> m_webSocketRequestKey3;
-        OwnPtr<WebSocketHandshakeResponse::ChallengeResponse> m_webSocketChallengeResponse;
-#endif
     };
 

trunk/WebCore/inspector/front-end/Resource.js

@@ -46 +46 @@
     XHR:        5,
     Media:      6,
-    WebSocket:  7,
-    Other:      8,
+    Other:      7,
 
     isTextType: function(type)
@@ -69 +68 @@
             case this.XHR:
                 return WebInspector.UIString("XHR");
-            case this.WebSocket:
-                return WebInspector.UIString("WebSocket");
             case this.Other:
             default:
@@ -367 +364 @@
                 this.category = WebInspector.resourceCategories.xhr;
                 break;
-            case WebInspector.Resource.Type.WebSocket:
-                this.category = WebInspector.resourceCategories.websocket;
-                break;
             case WebInspector.Resource.Type.Other:
             default:
@@ -582 +576 @@
         if (typeof this.type === "undefined"
          || this.type === WebInspector.Resource.Type.Other
-         || this.type === WebInspector.Resource.Type.XHR
-         || this.type === WebInspector.Resource.Type.WebSocket)
+         || this.type === WebInspector.Resource.Type.XHR)
             return true;
 

trunk/WebCore/inspector/front-end/ResourceView.js

@@ -279 +279 @@
     _refreshRequestHeaders: function()
     {
-        var additionalRow = null;
-        if (typeof this.resource.webSocketRequestKey3 !== "undefined")
-            additionalRow = {header: "(Key3)", value: this.resource.webSocketRequestKey3};
-        this._refreshHeaders(WebInspector.UIString("Request Headers"), this.resource.sortedRequestHeaders, additionalRow, this.requestHeadersTreeElement);
+        this._refreshHeaders(WebInspector.UIString("Request Headers"), this.resource.sortedRequestHeaders, this.requestHeadersTreeElement);
         this._refreshFormData();
     },
@@ -288 +285 @@
     _refreshResponseHeaders: function()
     {
-        var additionalRow = null;
-        if (typeof this.resource.webSocketChallengeResponse !== "undefined")
-            additionalRow = {header: "(Challenge Response)", value: this.resource.webSocketChallengeResponse};
-        this._refreshHeaders(WebInspector.UIString("Response Headers"), this.resource.sortedResponseHeaders, additionalRow, this.responseHeadersTreeElement);
+        this._refreshHeaders(WebInspector.UIString("Response Headers"), this.resource.sortedResponseHeaders, this.responseHeadersTreeElement);
     },
 
@@ -322 +316 @@
     },
     
-    _refreshHeaders: function(title, headers, additionalRow, headersTreeElement)
+    _refreshHeaders: function(title, headers, headersTreeElement)
     {
         headersTreeElement.removeChildren();
@@ -339 +333 @@
             headersTreeElement.appendChild(headerTreeElement);
         }
-
-        if (additionalRow) {
-            var title = "<div class=\"header-name\">" + additionalRow.header.escapeHTML() + ":</div>";
-            title += "<div class=\"header-value source-code\">" + additionalRow.value.escapeHTML() + "</div>"
-
-            var headerTreeElement = new TreeElement(title, null, false);
-            headerTreeElement.selectable = false;
-            headersTreeElement.appendChild(headerTreeElement);
-        }
     }
 }

trunk/WebCore/inspector/front-end/inspector.css

@@ -2820 +2820 @@
 
 .resources-category-documents, .resources-category-stylesheets, .resources-category-images,
-.resources-category-scripts, .resources-category-xhr, .resources-category-fonts,
-.resources-category-websockets, .resources-category-other {
+.resources-category-scripts, .resources-category-xhr, .resources-category-fonts, .resources-category-other {
     display: none;
 }
@@ -2831 +2830 @@
 .filter-all .resources-category-xhr, .filter-xhr .resources-category-xhr,
 .filter-all .resources-category-fonts, .filter-fonts .resources-category-fonts,
-.filter-all .resources-category-websockets, .filter-websockets .resources-category-websockets,
 .filter-all .resources-category-other, .filter-other .resources-category-other,
 .resource-sidebar-tree-item.selected {
@@ -2905 +2903 @@
 .resources-category-xhr.resource-cached .resources-graph-bar {
     -webkit-border-image: url(Images/timelineHollowPillYellow.png) 6 7 6 7;
-}
-
-/* FIXME: Create bar images for WebSocket. */
-.resources-category-websockets .resources-graph-bar {
-    -webkit-border-image: url(Images/timelinePillGray.png) 6 7 6 7;
-}
-
-.resources-category-websockets.resource-cached .resources-graph-bar {
-   -webkit-border-image: url(Images/timelineHollowPillGray.png) 6 7 6 7;
 }
 

trunk/WebCore/inspector/front-end/inspector.js

@@ -465 +465 @@
         xhr: new WebInspector.ResourceCategory("xhr", WebInspector.UIString("XHR"), "rgb(231,231,10)"),
         fonts: new WebInspector.ResourceCategory("fonts", WebInspector.UIString("Fonts"), "rgb(255,82,62)"),
-        websocket: new WebInspector.ResourceCategory("websockets", WebInspector.UIString("WebSocket"), "rgb(186,186,186)"), // FIXME: Decide the color.
         other: new WebInspector.ResourceCategory("other", WebInspector.UIString("Other"), "rgb(186,186,186)")
     };
@@ -1165 +1164 @@
         resource.requestFormData = payload.requestFormData;
         resource.documentURL = payload.documentURL;
-        if (typeof payload.webSocketRequestKey3 !== "undefined")
-            resource.webSocketRequestKey3 = payload.webSocketRequestKey3;
 
         if (resource.mainResource)
@@ -1191 +1188 @@
         resource.timing = payload.timing;
         resource.cached = payload.cached;
-        if (typeof payload.webSocketChallengeResponse !== "undefined")
-            resource.webSocketChallengeResponse = payload.webSocketChallengeResponse;
     }
 

trunk/WebCore/websockets/WebSocketChannel.cpp

@@ -37 +37 @@
 #include "CookieJar.h"
 #include "Document.h"
-#include "InspectorController.h"
 #include "Logging.h"
-#include "Page.h"
 #include "PlatformString.h"
-#include "ProgressTracker.h"
 #include "ScriptExecutionContext.h"
 #include "SocketStreamError.h"
@@ -66 +63 @@
     , m_closed(false)
     , m_unhandledBufferedAmount(0)
-#if ENABLE(INSPECTOR)
-    , m_identifier(0)
-#endif
-{
-#if ENABLE(INSPECTOR)
-    if (InspectorController* controller = m_context->inspectorController())
-        controller->didCreateWebSocket(identifier(), url, m_context->url());
-#endif
+{
 }
 
@@ -122 +112 @@
 {
     LOG(Network, "WebSocketChannel %p disconnect", this);
-#if ENABLE(INSPECTOR)
-    if (m_context)
-        if (InspectorController* controller = m_context->inspectorController())
-            controller->didCloseWebSocket(identifier());
-#endif
     m_handshake.clearScriptExecutionContext();
     m_client = 0;
@@ -152 +137 @@
     if (!m_context)
         return;
-#if ENABLE(INSPECTOR)
-    if (InspectorController* controller = m_context->inspectorController())
-        controller->willSendWebSocketHandshakeRequest(identifier(), m_handshake.clientHandshakeRequest());
-#endif
     const CString& handshakeMessage = m_handshake.clientHandshakeMessage();
     if (!handle->send(handshakeMessage.data(), handshakeMessage.length())) {
@@ -166 +147 @@
 {
     LOG(Network, "WebSocketChannel %p didClose", this);
-#if ENABLE(INSPECTOR)
-    if (m_context)
-        if (InspectorController* controller = m_context->inspectorController())
-            controller->didCloseWebSocket(identifier());
-#endif
     ASSERT_UNUSED(handle, handle == m_handle || !m_handle);
     m_closed = true;
@@ -262 +238 @@
             return false;
         if (m_handshake.mode() == WebSocketHandshake::Connected) {
-#if ENABLE(INSPECTOR)
-            if (InspectorController* controller = m_context->inspectorController())
-                controller->didReceiveWebSocketHandshakeResponse(identifier(), m_handshake.serverHandshakeResponse());
-#endif
             if (!m_handshake.serverSetCookie().isEmpty()) {
                 if (m_context->isDocument()) {
@@ -357 +329 @@
 }
 
-#if ENABLE(INSPECTOR)
-unsigned long WebSocketChannel::identifier()
-{
-    if (m_identifier)
-        return m_identifier;
-
-    if (InspectorController* controller = m_context->inspectorController())
-        if (Page* page = controller->inspectedPage())
-            m_identifier = page->progress()->createUniqueIdentifier();
-
-    ASSERT(m_identifier);
-    return m_identifier;
-}
-#endif // ENABLE(INSPECTOR)
-
 }  // namespace WebCore
 

trunk/WebCore/websockets/WebSocketChannel.h

@@ -85 +85 @@
         void resumeTimerFired(Timer<WebSocketChannel>* timer);
 
-#if ENABLE(INSPECTOR)
-        unsigned long identifier();
-#endif
-
         ScriptExecutionContext* m_context;
         WebSocketChannelClient* m_client;
@@ -100 +96 @@
         bool m_closed;
         unsigned long m_unhandledBufferedAmount;
-
-#if ENABLE(INSPECTOR)
-        unsigned long m_identifier;
-#endif
     };