[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
victorw at chromium.org
victorw at chromium.org
Wed Dec 22 11:30:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 84e64d2edd8be3af95c0c35f718b99b80674a83d
Author: victorw at chromium.org <victorw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 27 18:14:31 2010 +0000
2010-07-27 Victor Wang <victorw at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64142 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6aec3d5..25bd1a5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,46 @@
+2010-07-27 Victor Wang <victorw at 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 at google.com>
Reviewed by Jeremy Orlow.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 6d57bf7..e29c7ae 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -826,8 +826,6 @@ void InspectorController::addResource(InspectorResource* resource)
m_knownResources.add(resource->requestURL());
Frame* frame = resource->frame();
- if (!frame)
- return;
ResourcesMap* resourceMap = m_frameResources.get(frame);
if (resourceMap)
resourceMap->set(resource->identifier(), resource);
@@ -846,8 +844,6 @@ void InspectorController::removeResource(InspectorResource* resource)
m_knownResources.remove(requestURL);
Frame* frame = resource->frame();
- if (!frame)
- return;
ResourcesMap* resourceMap = m_frameResources.get(frame);
if (!resourceMap) {
ASSERT_NOT_REACHED();
@@ -1491,56 +1487,6 @@ InspectorDOMStorageResource* InspectorController::getDOMStorageResourceForId(lon
}
#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)
void InspectorController::addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, const String& sourceURL)
{
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index bc9473f..176dd11 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -92,11 +92,6 @@ class StorageArea;
class InspectorApplicationCacheAgent;
#endif
-#if ENABLE(WEB_SOCKETS)
-class WebSocketHandshakeRequest;
-class WebSocketHandshakeResponse;
-#endif
-
class InspectorController
#if ENABLE(JAVASCRIPT_DEBUGGER)
: ScriptDebugListener, public Noncopyable
@@ -228,12 +223,6 @@ public:
void setDOMStorageItem(long callId, long storageId, const String& key, const String& value);
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; }
InspectorResource* resourceForURL(const String& url);
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 385fd52..6a5919c 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -42,38 +42,15 @@
#include "ResourceLoadTiming.h"
#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)
, m_cached(false)
@@ -89,9 +66,6 @@ InspectorResource::InspectorResource(unsigned long identifier, DocumentLoader* l
, m_connectionID(0)
, m_connectionReused(false)
, m_isMainResource(false)
-#if ENABLE(WEB_SOCKETS)
- , m_isWebSocket(false)
-#endif
{
}
@@ -114,12 +88,6 @@ PassRefPtr<InspectorResource> InspectorResource::appendRedirect(unsigned long id
return redirect;
}
-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)
{
PassRefPtr<InspectorResource> resource = create(identifier, loader, KURL(ParsedURLString, cachedResource->url()));
@@ -139,16 +107,6 @@ PassRefPtr<InspectorResource> InspectorResource::createCached(unsigned long iden
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)
{
m_requestHeaderFields = request.httpHeaderFields();
@@ -188,27 +146,6 @@ void InspectorResource::updateResponse(const ResourceResponse& response)
m_changes.set(TypeChange);
}
-#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)
{
HTTPHeaderMap::const_iterator end = headers.end();
@@ -224,11 +161,8 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
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());
jsonObject.set("lastPathComponent", m_requestURL.lastPathComponent());
@@ -239,10 +173,6 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
jsonObject.set("requestMethod", m_requestMethod);
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
}
if (m_changes.hasChange(ResponseChange)) {
@@ -259,10 +189,6 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
jsonObject.set("cached", m_cached);
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);
}
@@ -321,8 +247,6 @@ CachedResource* InspectorResource::cachedResource() const
// Try hard to find a corresponding CachedResource. During preloading, DocLoader may not have the resource in document resources set yet,
// 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);
if (!cachedResource)
@@ -359,12 +283,6 @@ InspectorResource::Type InspectorResource::type() const
if (!m_overrideContent.isNull())
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();
if (resourceType == Other)
@@ -404,7 +322,7 @@ String InspectorResource::sourceString() const
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();
}
diff --git a/WebCore/inspector/InspectorResource.h b/WebCore/inspector/InspectorResource.h
index e5c3abc..48e1a20 100644
--- a/WebCore/inspector/InspectorResource.h
+++ b/WebCore/inspector/InspectorResource.h
@@ -36,8 +36,6 @@
#include "ScriptObject.h"
#include "ScriptState.h"
#include "ScriptString.h"
-#include "WebSocketHandshakeRequest.h"
-#include "WebSocketHandshakeResponse.h"
#include <wtf/CurrentTime.h>
#include <wtf/OwnPtr.h>
@@ -55,11 +53,6 @@ namespace WebCore {
class ResourceRequest;
class ResourceResponse;
-#if ENABLE(WEB_SOCKETS)
- class WebSocketHandshakeRequest;
- class WebSocketHandshakeResponse;
-#endif
-
class InspectorResource : public RefCounted<InspectorResource> {
public:
@@ -72,19 +65,16 @@ namespace WebCore {
Script,
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();
PassRefPtr<InspectorResource> appendRedirect(unsigned long identifier, const KURL& redirectURL);
@@ -94,11 +84,6 @@ namespace WebCore {
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);
String sourceString() const;
@@ -168,15 +153,10 @@ namespace WebCore {
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;
String m_mimeType;
@@ -203,15 +183,6 @@ namespace WebCore {
String m_requestMethod;
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
};
} // namespace WebCore
diff --git a/WebCore/inspector/front-end/Resource.js b/WebCore/inspector/front-end/Resource.js
index cedded3..06a610d 100644
--- a/WebCore/inspector/front-end/Resource.js
+++ b/WebCore/inspector/front-end/Resource.js
@@ -45,8 +45,7 @@ WebInspector.Resource.Type = {
Script: 4,
XHR: 5,
Media: 6,
- WebSocket: 7,
- Other: 8,
+ Other: 7,
isTextType: function(type)
{
@@ -68,8 +67,6 @@ WebInspector.Resource.Type = {
return WebInspector.UIString("script");
case this.XHR:
return WebInspector.UIString("XHR");
- case this.WebSocket:
- return WebInspector.UIString("WebSocket");
case this.Other:
default:
return WebInspector.UIString("other");
@@ -366,9 +363,6 @@ WebInspector.Resource.prototype = {
case WebInspector.Resource.Type.XHR:
this.category = WebInspector.resourceCategories.xhr;
break;
- case WebInspector.Resource.Type.WebSocket:
- this.category = WebInspector.resourceCategories.websocket;
- break;
case WebInspector.Resource.Type.Other:
default:
this.category = WebInspector.resourceCategories.other;
@@ -581,8 +575,7 @@ WebInspector.Resource.prototype = {
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;
if (this.mimeType in WebInspector.MIMETypes)
diff --git a/WebCore/inspector/front-end/ResourceView.js b/WebCore/inspector/front-end/ResourceView.js
index 517e916..bfd1576 100644
--- a/WebCore/inspector/front-end/ResourceView.js
+++ b/WebCore/inspector/front-end/ResourceView.js
@@ -278,19 +278,13 @@ WebInspector.ResourceView.prototype = {
_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();
},
_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);
},
_refreshHTTPInformation: function()
@@ -321,7 +315,7 @@ WebInspector.ResourceView.prototype = {
}
},
- _refreshHeaders: function(title, headers, additionalRow, headersTreeElement)
+ _refreshHeaders: function(title, headers, headersTreeElement)
{
headersTreeElement.removeChildren();
@@ -338,15 +332,6 @@ WebInspector.ResourceView.prototype = {
headerTreeElement.selectable = false;
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);
- }
}
}
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index e8e4782..f1ee49f 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2819,8 +2819,7 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
}
.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;
}
@@ -2830,7 +2829,6 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
.filter-all .resources-category-scripts, .filter-scripts .resources-category-scripts,
.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 {
display: list-item;
@@ -2906,15 +2904,6 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
-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;
-}
-
#resource-views {
position: absolute;
top: 23px;
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index f1f67fa..0adf057 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -464,7 +464,6 @@ WebInspector.loaded = function()
scripts: new WebInspector.ResourceCategory("scripts", WebInspector.UIString("Scripts"), "rgb(255,121,0)"),
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)")
};
@@ -1164,8 +1163,6 @@ WebInspector.updateResource = function(identifier, payload)
resource.requestMethod = payload.requestMethod;
resource.requestFormData = payload.requestFormData;
resource.documentURL = payload.documentURL;
- if (typeof payload.webSocketRequestKey3 !== "undefined")
- resource.webSocketRequestKey3 = payload.webSocketRequestKey3;
if (resource.mainResource)
this.mainResource = resource;
@@ -1190,8 +1187,6 @@ WebInspector.updateResource = function(identifier, payload)
resource.connectionReused = payload.connectionReused;
resource.timing = payload.timing;
resource.cached = payload.cached;
- if (typeof payload.webSocketChallengeResponse !== "undefined")
- resource.webSocketChallengeResponse = payload.webSocketChallengeResponse;
}
if (payload.didTypeChange) {
diff --git a/WebCore/websockets/WebSocketChannel.cpp b/WebCore/websockets/WebSocketChannel.cpp
index c618d86..5859fd7 100644
--- a/WebCore/websockets/WebSocketChannel.cpp
+++ b/WebCore/websockets/WebSocketChannel.cpp
@@ -36,11 +36,8 @@
#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"
#include "SocketStreamHandle.h"
@@ -65,14 +62,7 @@ WebSocketChannel::WebSocketChannel(ScriptExecutionContext* context, WebSocketCha
, m_suspended(false)
, 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
}
WebSocketChannel::~WebSocketChannel()
@@ -121,11 +111,6 @@ void WebSocketChannel::close()
void WebSocketChannel::disconnect()
{
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;
m_context = 0;
@@ -151,10 +136,6 @@ void WebSocketChannel::didOpen(SocketStreamHandle* handle)
ASSERT(handle == m_handle);
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())) {
m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "Error sending handshake message.", 0, m_handshake.clientOrigin());
@@ -165,11 +146,6 @@ void WebSocketChannel::didOpen(SocketStreamHandle* handle)
void WebSocketChannel::didClose(SocketStreamHandle* handle)
{
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;
if (m_handle) {
@@ -261,10 +237,6 @@ bool WebSocketChannel::processBuffer()
if (headerLength <= 0)
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()) {
Document* document = static_cast<Document*>(m_context);
@@ -356,21 +328,6 @@ void WebSocketChannel::resumeTimerFired(Timer<WebSocketChannel>* timer)
didClose(m_handle.get());
}
-#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
#endif // ENABLE(WEB_SOCKETS)
diff --git a/WebCore/websockets/WebSocketChannel.h b/WebCore/websockets/WebSocketChannel.h
index 48c51cc..a90c6dc 100644
--- a/WebCore/websockets/WebSocketChannel.h
+++ b/WebCore/websockets/WebSocketChannel.h
@@ -84,10 +84,6 @@ namespace WebCore {
bool processBuffer();
void resumeTimerFired(Timer<WebSocketChannel>* timer);
-#if ENABLE(INSPECTOR)
- unsigned long identifier();
-#endif
-
ScriptExecutionContext* m_context;
WebSocketChannelClient* m_client;
WebSocketHandshake m_handshake;
@@ -99,10 +95,6 @@ namespace WebCore {
bool m_suspended;
bool m_closed;
unsigned long m_unhandledBufferedAmount;
-
-#if ENABLE(INSPECTOR)
- unsigned long m_identifier;
-#endif
};
} // namespace WebCore
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list