Changeset 76030 in webkit

Timestamp:

Jan 18, 2011 9:40:28 AM (13 years ago)

Author:

caseq@chromium.org

Message:

2011-01-18 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: fail resource.requestContent() immediately for WebSocket resources
Remove webInspector.resources.Types from test expectations.
​https://bugs.webkit.org/show_bug.cgi?id=52628

• inspector/extensions-api-expected.txt:

2011-01-18 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: fail resource.requestContent() immediately for WebSocket resources
​https://bugs.webkit.org/show_bug.cgi?id=52628

• English.lproj/localizedStrings.js: Rename WebSocket -> WebSockets in resource catetegories (rest are in plural, too)
• inspector/front-end/ExtensionServer.js: Do not expose webInspector.resources.Types in extensions API (obsolete) (WebInspector.ExtensionServer.prototype._buildExtensionAPIInjectedScript):
• inspector/front-end/Resource.js: (WebInspector.Resource.Type.toUIString): Remove ResourceType.Media as it's not used. (WebInspector.Resource.Type.toString): ditto. (WebInspector.Resource.prototype.requestContent): Fail immediately for WebSocket resources.
• inspector/front-end/inspector.js: Rename WebSocket -> WebSockets in resource catetegories (rest are in plural, too)

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/extensions-api-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/English.lproj/localizedStrings.js (modified) (previous)
• Source/WebCore/inspector/front-end/ExtensionServer.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/Resource.js (modified) (4 diffs)
• Source/WebCore/inspector/front-end/inspector.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-18  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: fail resource.requestContent() immediately for WebSocket resources
+        Remove webInspector.resources.Types from test expectations.
+        https://bugs.webkit.org/show_bug.cgi?id=52628
+
+        * inspector/extensions-api-expected.txt:
+
 2011-01-18  Helder Correia  <helder@sencha.com>
 

trunk/LayoutTests/inspector/extensions-api-expected.txt

@@ -40 +40 @@
             removeListener : <function>
         }
-        Types : {
-            Document : "document"
-            Stylesheet : "stylesheet"
-            Image : "image"
-            Font : "font"
-            Script : "script"
-            XHR : "xhr"
-            Media : "media"
-            WebSocket : "websocket"
-            Other : "other"
-        }
         getHAR : <function>
         addRequestHeaders : <function>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-18  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: fail resource.requestContent() immediately for WebSocket resources
+        https://bugs.webkit.org/show_bug.cgi?id=52628
+
+        * English.lproj/localizedStrings.js: Rename WebSocket -> WebSockets in resource catetegories (rest are in plural, too)
+        * inspector/front-end/ExtensionServer.js: Do not expose webInspector.resources.Types in extensions API (obsolete)
+        (WebInspector.ExtensionServer.prototype._buildExtensionAPIInjectedScript):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.Type.toUIString): Remove ResourceType.Media as it's not used.
+        (WebInspector.Resource.Type.toString): ditto.
+        (WebInspector.Resource.prototype.requestContent): Fail immediately for WebSocket resources.
+        * inspector/front-end/inspector.js: Rename WebSocket -> WebSockets in resource catetegories (rest are in plural, too)
+
 2011-01-18  Helder Correia  <helder@sencha.com>
 

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

@@ -397 +397 @@
             "(" + WebInspector.commonExtensionSymbols.toString() + ")(apiPrivate);" +
             "(" + WebInspector.injectedExtensionAPI.toString() + ").apply(this, arguments);" +
-            "webInspector.resources.Types = " + JSON.stringify(resourceTypes) + ";" +
             platformAPI +
             "})";

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

@@ -45 +45 @@
     Script:     4,
     XHR:        5,
-    Media:      6,
     WebSocket:  7,
     Other:      8,
@@ -69 +68 @@
             case this.XHR:
                 return WebInspector.UIString("XHR");
-            case this.Media:
-                return WebInspector.UIString("Media");
             case this.WebSocket:
                 return WebInspector.UIString("WebSocket");
@@ -96 +93 @@
             case this.XHR:
                 return "xhr";
-            case this.Media:
-                return "media";
             case this.WebSocket:
                 return "websocket";
@@ -670 +665 @@
     requestContent: function(callback)
     {
+        // We do not support content retrieval for WebSockets at the moment.
+        // Since WebSockets are potentially long-living, fail requests immediately
+        // to prevent caller blocking until resource is marked as finished.
+        if (this.type === WebInspector.Resource.Type.WebSocket) {
+            callback(null, null);
+            return;
+        }
         if (this._content) {
             callback(this._content, this._contentEncoded);

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

@@ -535 +535 @@
         xhr: new WebInspector.ResourceCategory("xhr", WebInspector.UIString("XHR"), "rgb(231,231,10)"),
         fonts: new WebInspector.ResourceCategory("fonts", WebInspector.UIString("Fonts"), "rgb(255,82,62)"),
-        websockets: new WebInspector.ResourceCategory("websockets", WebInspector.UIString("WebSocket"), "rgb(186,186,186)"), // FIXME: Decide the color.
+        websockets: new WebInspector.ResourceCategory("websockets", WebInspector.UIString("WebSockets"), "rgb(186,186,186)"), // FIXME: Decide the color.
         other: new WebInspector.ResourceCategory("other", WebInspector.UIString("Other"), "rgb(186,186,186)")
     };