Changeset 83987 in webkit

Timestamp:

Apr 15, 2011 10:32:04 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-15 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText
​https://bugs.webkit.org/show_bug.cgi?id=58650

• inspector/Inspector.json:
• inspector/InspectorResourceAgent.cpp: (WebCore::buildObjectForResourceResponse):
• inspector/front-end/NetworkManager.js: (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
• inspector/front-end/Resource.js: (WebInspector.Resource.prototype.get requestHeadersText): (WebInspector.Resource.prototype.set requestHeadersText): (WebInspector.Resource.prototype.get requestHeadersSize): (WebInspector.Resource.prototype.get responseHeadersText): (WebInspector.Resource.prototype.set responseHeadersText): (WebInspector.Resource.prototype.get responseHeadersSize): (WebInspector.Resource.prototype._headersSize):
• inspector/front-end/ResourceHeadersView.js: (WebInspector.ResourceHeadersView): (WebInspector.ResourceHeadersView.prototype._refreshRequestHeaders): (WebInspector.ResourceHeadersView.prototype._refreshResponseHeaders): (WebInspector.ResourceHeadersView.prototype._refreshHeadersTitle): (WebInspector.ResourceHeadersView.prototype._refreshHeadersText): (WebInspector.ResourceHeadersView.prototype._toggleRequestHeadersText): (WebInspector.ResourceHeadersView.prototype._toggleResponseHeadersText): (WebInspector.ResourceHeadersView.prototype._createHeadersToggleButton):
• inspector/front-end/networkPanel.css: (.resource-headers-view .outline-disclosure li.headers-text):
• platform/network/ResourceLoadInfo.h:

2011-04-15 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText
​https://bugs.webkit.org/show_bug.cgi?id=58650

• public/WebHTTPLoadInfo.h:
• src/WebHTTPLoadInfo.cpp: (WebKit::WebHTTPLoadInfo::requestHeadersText): (WebKit::WebHTTPLoadInfo::setRequestHeadersText): (WebKit::WebHTTPLoadInfo::responseHeadersText): (WebKit::WebHTTPLoadInfo::setResponseHeadersText):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/Inspector.json (modified) (1 diff)
• WebCore/inspector/InspectorResourceAgent.cpp (modified) (1 diff)
• WebCore/inspector/front-end/NetworkManager.js (modified) (1 diff)
• WebCore/inspector/front-end/Resource.js (modified) (5 diffs)
• WebCore/inspector/front-end/ResourceHeadersView.js (modified) (7 diffs)
• WebCore/inspector/front-end/networkPanel.css (modified) (1 diff)
• WebCore/platform/network/ResourceLoadInfo.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebHTTPLoadInfo.h (modified) (1 diff)
• WebKit/chromium/src/WebHTTPLoadInfo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-15  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText
+        https://bugs.webkit.org/show_bug.cgi?id=58650
+
+        * inspector/Inspector.json:
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::buildObjectForResourceResponse):
+        * inspector/front-end/NetworkManager.js:
+        (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.get requestHeadersText):
+        (WebInspector.Resource.prototype.set requestHeadersText):
+        (WebInspector.Resource.prototype.get requestHeadersSize):
+        (WebInspector.Resource.prototype.get responseHeadersText):
+        (WebInspector.Resource.prototype.set responseHeadersText):
+        (WebInspector.Resource.prototype.get responseHeadersSize):
+        (WebInspector.Resource.prototype._headersSize):
+        * inspector/front-end/ResourceHeadersView.js:
+        (WebInspector.ResourceHeadersView):
+        (WebInspector.ResourceHeadersView.prototype._refreshRequestHeaders):
+        (WebInspector.ResourceHeadersView.prototype._refreshResponseHeaders):
+        (WebInspector.ResourceHeadersView.prototype._refreshHeadersTitle):
+        (WebInspector.ResourceHeadersView.prototype._refreshHeadersText):
+        (WebInspector.ResourceHeadersView.prototype._toggleRequestHeadersText):
+        (WebInspector.ResourceHeadersView.prototype._toggleResponseHeadersText):
+        (WebInspector.ResourceHeadersView.prototype._createHeadersToggleButton):
+        * inspector/front-end/networkPanel.css:
+        (.resource-headers-view .outline-disclosure li.headers-text):
+        * platform/network/ResourceLoadInfo.h:
+
 2011-04-15  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -337 +337 @@
                     { "name": "statusText", "type": "string", "description": "HTTP response status text." },
                     { "name": "headers", "type": "object", "description": "HTTP response headers." },
-                    { "name": "rawHeadersText", "type": "string", "optional": true, "description": "Raw HTTP response headers text." },
+                    { "name": "headersText", "type": "string", "optional": true, "description": "HTTP response headers text." },
                     { "name": "mimeType", "type": "string", "description": "Resource mimeType as determined by the browser." },
                     { "name": "requestHeaders", "type": "object", "optional": true, "description": "Refined HTTP request headers that were actually transmitted over the network." },
-                    { "name": "rawRequestHeadersText", "type": "string", "optional": true, "description": "Raw HTTP request headers text." },
+                    { "name": "requestHeadersText", "type": "string", "optional": true, "description": "HTTP request headers text." },
                     { "name": "connectionReused", "type": "boolean", "description": "Specifies whether physical connection was actually reused for this request." },
                     { "name": "connectionID", "type": "number", "description": "Physical connection id that was actually used for this request." },

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -246 +246 @@
     if (response.resourceLoadInfo()) {
         responseObject->setObject("headers", buildObjectForHeaders(response.resourceLoadInfo()->responseHeaders));
-        if (!response.resourceLoadInfo()->rawResponseHeadersText.isEmpty())
-            responseObject->setString("rawHeadersText", response.resourceLoadInfo()->rawResponseHeadersText);
+        if (!response.resourceLoadInfo()->responseHeadersText.isEmpty())
+            responseObject->setString("headersText", response.resourceLoadInfo()->responseHeadersText);
 
         responseObject->setObject("requestHeaders", buildObjectForHeaders(response.resourceLoadInfo()->requestHeaders));
-        if (!response.resourceLoadInfo()->rawRequestHeadersText.isEmpty())
-            responseObject->setString("rawRequestHeadersText", response.resourceLoadInfo()->rawRequestHeadersText);
+        if (!response.resourceLoadInfo()->requestHeadersText.isEmpty())
+            responseObject->setString("requestHeadersText", response.resourceLoadInfo()->requestHeadersText);
     } else
         responseObject->setObject("headers", buildObjectForHeaders(response.httpHeaderFields()));

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

@@ -93 +93 @@
         resource.statusText = response.statusText;
         resource.responseHeaders = response.headers;
-        if (response.rawHeadersText)
-            resource.rawResponseHeadersText = response.rawHeadersText;
+        if (response.headersText)
+            resource.responseHeadersText = response.headersText;
         if (response.requestHeaders)
             resource.requestHeaders = response.requestHeaders;
-        if (response.rawRequestHeadersText)
-            resource.rawRequestHeadersText = response.rawRequestHeadersText;
+        if (response.requestHeadersText)
+            resource.requestHeadersText = response.requestHeadersText;
 
         resource.connectionReused = response.connectionReused;

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

@@ -420 +420 @@
     },
 
-    get rawRequestHeadersText()
-    {
-        return this._rawRequestHeadersText;
-    },
-
-    set rawRequestHeadersText(x)
-    {
-        this._rawRequestHeadersText = x;
+    get requestHeadersText()
+    {
+        return this._requestHeadersText;
+    },
+
+    set requestHeadersText(x)
+    {
+        this._requestHeadersText = x;
         delete this._responseHeadersSize;
 
@@ -436 +436 @@
     {
         if (typeof(this._requestHeadersSize) === "undefined") {
-            if (this._rawRequestHeadersText)
-                this._requestHeadersSize = this._rawRequestHeadersText.length;
+            if (this._requestHeadersText)
+                this._requestHeadersSize = this._requestHeadersText.length;
             else 
                 this._requestHeadersSize = this._headersSize(this._requestHeaders)
@@ -495 +495 @@
     },
     
-    get rawResponseHeadersText()
-    {
-        return this._rawResponseHeadersText;
-    },
-
-    set rawResponseHeadersText(x)
-    {
-        this._rawResponseHeadersText = x;
+    get responseHeadersText()
+    {
+        return this._responseHeadersText;
+    },
+
+    set responseHeadersText(x)
+    {
+        this._responseHeadersText = x;
         delete this._responseHeadersSize;
 
@@ -511 +511 @@
     {
         if (typeof(this._responseHeadersSize) === "undefined") {
-            if (this._rawResponseHeadersText)
-                this._responseHeadersSize = this._rawResponseHeadersText.length;
+            if (this._responseHeadersText)
+                this._responseHeadersSize = this._responseHeadersText.length;
             else 
                 this._responseHeadersSize = this._headersSize(this._responseHeaders)
@@ -598 +598 @@
     {
         // We should take actual headers size from network stack, when possible, but fall back to
-        // this lousy computation when no raw headers are available.
+        // this lousy computation when no headers text is available.
         var size = 0;
         for (var header in headers)

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

@@ -62 +62 @@
     this._decodeRequestParameters = true;
 
-    this._showRawRequestHeadersText = false;
-    this._showRawResponseHeadersText = false;
+    this._showRequestHeadersText = false;
+    this._showResponseHeadersText = false;
 
     this._queryStringTreeElement = new TreeElement("", null, true);
@@ -215 +215 @@
         if (typeof this._resource.webSocketRequestKey3 !== "undefined")
             additionalRow = {header: "(Key3)", value: this._resource.webSocketRequestKey3};
-        if (this._showRawRequestHeadersText)
-            this._refreshRawHeadersText(WebInspector.UIString("Request Headers"), this._resource.rawRequestHeadersText, this._requestHeadersTreeElement);
+        if (this._showRequestHeadersText)
+            this._refreshHeadersText(WebInspector.UIString("Request Headers"), this._resource.requestHeadersText, this._requestHeadersTreeElement);
         else 
             this._refreshHeaders(WebInspector.UIString("Request Headers"), this._resource.sortedRequestHeaders, additionalRow, this._requestHeadersTreeElement);
 
-        if (this._resource.rawRequestHeadersText) { 
-            var toggleButton = this._createHeadersToggleButton(this._showRawRequestHeadersText);
-            toggleButton.addEventListener("click", this._toggleRawRequestHeadersText.bind(this));
+        if (this._resource.requestHeadersText) { 
+            var toggleButton = this._createHeadersToggleButton(this._showRequestHeadersText);
+            toggleButton.addEventListener("click", this._toggleRequestHeadersText.bind(this));
             this._requestHeadersTreeElement.listItemElement.appendChild(toggleButton);
         }
@@ -234 +234 @@
         if (typeof this._resource.webSocketChallengeResponse !== "undefined")
             additionalRow = {header: "(Challenge Response)", value: this._resource.webSocketChallengeResponse};
-        if (this._showRawResponseHeadersText)
-            this._refreshRawHeadersText(WebInspector.UIString("Response Headers"), this._resource.rawResponseHeadersText, this._responseHeadersTreeElement);
+        if (this._showResponseHeadersText)
+            this._refreshHeadersText(WebInspector.UIString("Response Headers"), this._resource.responseHeadersText, this._responseHeadersTreeElement);
         else
             this._refreshHeaders(WebInspector.UIString("Response Headers"), this._resource.sortedResponseHeaders, additionalRow, this._responseHeadersTreeElement);
         
-        if (this._resource.rawResponseHeadersText) {
-            var toggleButton = this._createHeadersToggleButton(this._showRawResponseHeadersText);
-            toggleButton.addEventListener("click", this._toggleRawResponseHeadersText.bind(this));
+        if (this._resource.responseHeadersText) {
+            var toggleButton = this._createHeadersToggleButton(this._showResponseHeadersText);
+            toggleButton.addEventListener("click", this._toggleResponseHeadersText.bind(this));
             this._responseHeadersTreeElement.listItemElement.appendChild(toggleButton);
         }
@@ -274 +274 @@
     },
     
-    _refreshHeadersTitle: function(title, headersTreeElement, isRawHeadersTextShown, headersLength)
+    _refreshHeadersTitle: function(title, headersTreeElement, isHeadersTextShown, headersLength)
     {
         headersTreeElement.listItemElement.removeChildren();
         headersTreeElement.listItemElement.appendChild(document.createTextNode(title));
         
-        if (!isRawHeadersTextShown) {
+        if (!isHeadersTextShown) {
             var headerCount = document.createElement("span");
             headerCount.addStyleClass("header-count");
@@ -315 +315 @@
     },
     
-    _refreshRawHeadersText: function(title, rawHeadersText, headersTreeElement)
+    _refreshHeadersText: function(title, headersText, headersTreeElement)
     {
         headersTreeElement.removeChildren();
@@ -323 +323 @@
         headerTreeElement.selectable = false;
         headersTreeElement.appendChild(headerTreeElement);
-        headerTreeElement.listItemElement.addStyleClass("raw-headers-text");
-        
-        var rawHeadersTextElement = document.createElement("span");
-        rawHeadersTextElement.addStyleClass("header-value");
-        rawHeadersTextElement.addStyleClass("source-code");
-        rawHeadersTextElement.textContent = String(rawHeadersText).trim();
-        headerTreeElement.listItemElement.appendChild(rawHeadersTextElement);
-    },
-
-    _toggleRawRequestHeadersText: function(event)
-    {
-        this._showRawRequestHeadersText = !this._showRawRequestHeadersText;
+        headerTreeElement.listItemElement.addStyleClass("headers-text");
+        
+        var headersTextElement = document.createElement("span");
+        headersTextElement.addStyleClass("header-value");
+        headersTextElement.addStyleClass("source-code");
+        headersTextElement.textContent = String(headersText).trim();
+        headerTreeElement.listItemElement.appendChild(headersTextElement);
+    },
+
+    _toggleRequestHeadersText: function(event)
+    {
+        this._showRequestHeadersText = !this._showRequestHeadersText;
         this._refreshRequestHeaders();
     },
 
-    _toggleRawResponseHeadersText: function(event)
-    {
-        this._showRawResponseHeadersText = !this._showRawResponseHeadersText;
+    _toggleResponseHeadersText: function(event)
+    {
+        this._showResponseHeadersText = !this._showResponseHeadersText;
         this._refreshResponseHeaders();
     },
@@ -352 +352 @@
     },
     
-    _createHeadersToggleButton: function(isRawHeadersTextShown)
-    {
-        var toggleTitle = isRawHeadersTextShown ? WebInspector.UIString("view parsed") : WebInspector.UIString("view source");
+    _createHeadersToggleButton: function(isHeadersTextShown)
+    {
+        var toggleTitle = isHeadersTextShown ? WebInspector.UIString("view parsed") : WebInspector.UIString("view source");
         return this._createToggleButton(toggleTitle);
     }

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

@@ -748 +748 @@
 }
 
-.resource-headers-view .outline-disclosure li.raw-headers-text {
+.resource-headers-view .outline-disclosure li.headers-text {
     text-indent: 0;
     margin-left: -2px;

trunk/Source/WebCore/platform/network/ResourceLoadInfo.h

@@ -42 +42 @@
     HTTPHeaderMap requestHeaders;
     HTTPHeaderMap responseHeaders;
-    String rawRequestHeadersText;
-    String rawResponseHeadersText;
+    String requestHeadersText;
+    String responseHeadersText;
 };
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-15  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText
+        https://bugs.webkit.org/show_bug.cgi?id=58650
+
+        * public/WebHTTPLoadInfo.h:
+        * src/WebHTTPLoadInfo.cpp:
+        (WebKit::WebHTTPLoadInfo::requestHeadersText):
+        (WebKit::WebHTTPLoadInfo::setRequestHeadersText):
+        (WebKit::WebHTTPLoadInfo::responseHeadersText):
+        (WebKit::WebHTTPLoadInfo::setResponseHeadersText):
+
 2011-04-15  Zelidrag Hornung  <zelidrag@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebHTTPLoadInfo.h

@@ -69 +69 @@
     WEBKIT_API void addResponseHeader(const WebString& name, const WebString& value);
 
-    WEBKIT_API WebString rawRequestHeadersText() const;
-    WEBKIT_API void setRawRequestHeadersText(const WebString&);
+    WEBKIT_API WebString requestHeadersText() const;
+    WEBKIT_API void setRequestHeadersText(const WebString&);
 
-    WEBKIT_API WebString rawResponseHeadersText() const;
-    WEBKIT_API void setRawResponseHeadersText(const WebString&);
+    WEBKIT_API WebString responseHeadersText() const;
+    WEBKIT_API void setResponseHeadersText(const WebString&);
 
 #if WEBKIT_IMPLEMENTATION

trunk/Source/WebKit/chromium/src/WebHTTPLoadInfo.cpp

@@ -121 +121 @@
 }
 
-WebString WebHTTPLoadInfo::rawRequestHeadersText() const
+WebString WebHTTPLoadInfo::requestHeadersText() const
 {
     ASSERT(!m_private.isNull());
-    return m_private->rawRequestHeadersText;
+    return m_private->requestHeadersText;
 }
 
-void WebHTTPLoadInfo::setRawRequestHeadersText(const WebString& rawHeadersText)
+void WebHTTPLoadInfo::setRequestHeadersText(const WebString& headersText)
 {
     ASSERT(!m_private.isNull());
-    m_private->rawRequestHeadersText = rawHeadersText;
+    m_private->requestHeadersText = headersText;
 }
 
-WebString WebHTTPLoadInfo::rawResponseHeadersText() const
+WebString WebHTTPLoadInfo::responseHeadersText() const
 {
     ASSERT(!m_private.isNull());
-    return m_private->rawResponseHeadersText;
+    return m_private->responseHeadersText;
 }
 
-void WebHTTPLoadInfo::setRawResponseHeadersText(const WebString& rawHeadersText)
+void WebHTTPLoadInfo::setResponseHeadersText(const WebString& headersText)
 {
     ASSERT(!m_private.isNull());
-    m_private->rawResponseHeadersText = rawHeadersText;
+    m_private->responseHeadersText = headersText;
 }