Skip to content

Commit 979093c

Browse files
webkit-commit-queuewebkit-commit-queue
committed
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): Canonical link: https://commits.webkit.org/73741@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83987 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 4f5b86f commit 979093c

11 files changed

Lines changed: 112 additions & 65 deletions

File tree

‎Source/WebCore/ChangeLog‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
2011-04-15 Vsevolod Vlasov <vsevik@chromium.org>
2+
3+
Reviewed by Pavel Feldman.
4+
5+
Web Inspector: Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText
6+
https://bugs.webkit.org/show_bug.cgi?id=58650
7+
8+
* inspector/Inspector.json:
9+
* inspector/InspectorResourceAgent.cpp:
10+
(WebCore::buildObjectForResourceResponse):
11+
* inspector/front-end/NetworkManager.js:
12+
(WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
13+
* inspector/front-end/Resource.js:
14+
(WebInspector.Resource.prototype.get requestHeadersText):
15+
(WebInspector.Resource.prototype.set requestHeadersText):
16+
(WebInspector.Resource.prototype.get requestHeadersSize):
17+
(WebInspector.Resource.prototype.get responseHeadersText):
18+
(WebInspector.Resource.prototype.set responseHeadersText):
19+
(WebInspector.Resource.prototype.get responseHeadersSize):
20+
(WebInspector.Resource.prototype._headersSize):
21+
* inspector/front-end/ResourceHeadersView.js:
22+
(WebInspector.ResourceHeadersView):
23+
(WebInspector.ResourceHeadersView.prototype._refreshRequestHeaders):
24+
(WebInspector.ResourceHeadersView.prototype._refreshResponseHeaders):
25+
(WebInspector.ResourceHeadersView.prototype._refreshHeadersTitle):
26+
(WebInspector.ResourceHeadersView.prototype._refreshHeadersText):
27+
(WebInspector.ResourceHeadersView.prototype._toggleRequestHeadersText):
28+
(WebInspector.ResourceHeadersView.prototype._toggleResponseHeadersText):
29+
(WebInspector.ResourceHeadersView.prototype._createHeadersToggleButton):
30+
* inspector/front-end/networkPanel.css:
31+
(.resource-headers-view .outline-disclosure li.headers-text):
32+
* platform/network/ResourceLoadInfo.h:
33+
134
2011-04-15 Luke Macpherson <macpherson@chromium.org>
235

336
Reviewed by Dimitri Glazkov.

‎Source/WebCore/inspector/Inspector.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@
336336
{ "name": "status", "type": "number", "description": "HTTP response status code." },
337337
{ "name": "statusText", "type": "string", "description": "HTTP response status text." },
338338
{ "name": "headers", "type": "object", "description": "HTTP response headers." },
339-
{ "name": "rawHeadersText", "type": "string", "optional": true, "description": "Raw HTTP response headers text." },
339+
{ "name": "headersText", "type": "string", "optional": true, "description": "HTTP response headers text." },
340340
{ "name": "mimeType", "type": "string", "description": "Resource mimeType as determined by the browser." },
341341
{ "name": "requestHeaders", "type": "object", "optional": true, "description": "Refined HTTP request headers that were actually transmitted over the network." },
342-
{ "name": "rawRequestHeadersText", "type": "string", "optional": true, "description": "Raw HTTP request headers text." },
342+
{ "name": "requestHeadersText", "type": "string", "optional": true, "description": "HTTP request headers text." },
343343
{ "name": "connectionReused", "type": "boolean", "description": "Specifies whether physical connection was actually reused for this request." },
344344
{ "name": "connectionID", "type": "number", "description": "Physical connection id that was actually used for this request." },
345345
{ "name": "fromDiskCache", "type": "boolean", "optional": true, "description": "Specifies that the resource was loaded from the disk cache." },

‎Source/WebCore/inspector/InspectorResourceAgent.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,12 @@ static PassRefPtr<InspectorObject> buildObjectForResourceResponse(const Resource
245245

246246
if (response.resourceLoadInfo()) {
247247
responseObject->setObject("headers", buildObjectForHeaders(response.resourceLoadInfo()->responseHeaders));
248-
if (!response.resourceLoadInfo()->rawResponseHeadersText.isEmpty())
249-
responseObject->setString("rawHeadersText", response.resourceLoadInfo()->rawResponseHeadersText);
248+
if (!response.resourceLoadInfo()->responseHeadersText.isEmpty())
249+
responseObject->setString("headersText", response.resourceLoadInfo()->responseHeadersText);
250250

251251
responseObject->setObject("requestHeaders", buildObjectForHeaders(response.resourceLoadInfo()->requestHeaders));
252-
if (!response.resourceLoadInfo()->rawRequestHeadersText.isEmpty())
253-
responseObject->setString("rawRequestHeadersText", response.resourceLoadInfo()->rawRequestHeadersText);
252+
if (!response.resourceLoadInfo()->requestHeadersText.isEmpty())
253+
responseObject->setString("requestHeadersText", response.resourceLoadInfo()->requestHeadersText);
254254
} else
255255
responseObject->setObject("headers", buildObjectForHeaders(response.httpHeaderFields()));
256256

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ WebInspector.NetworkDispatcher.prototype = {
9292
resource.statusCode = response.status;
9393
resource.statusText = response.statusText;
9494
resource.responseHeaders = response.headers;
95-
if (response.rawHeadersText)
96-
resource.rawResponseHeadersText = response.rawHeadersText;
95+
if (response.headersText)
96+
resource.responseHeadersText = response.headersText;
9797
if (response.requestHeaders)
9898
resource.requestHeaders = response.requestHeaders;
99-
if (response.rawRequestHeadersText)
100-
resource.rawRequestHeadersText = response.rawRequestHeadersText;
99+
if (response.requestHeadersText)
100+
resource.requestHeadersText = response.requestHeadersText;
101101

102102
resource.connectionReused = response.connectionReused;
103103
resource.connectionID = response.connectionID;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -419,14 +419,14 @@ WebInspector.Resource.prototype = {
419419
this.dispatchEventToListeners("requestHeaders changed");
420420
},
421421

422-
get rawRequestHeadersText()
422+
get requestHeadersText()
423423
{
424-
return this._rawRequestHeadersText;
424+
return this._requestHeadersText;
425425
},
426426

427-
set rawRequestHeadersText(x)
427+
set requestHeadersText(x)
428428
{
429-
this._rawRequestHeadersText = x;
429+
this._requestHeadersText = x;
430430
delete this._responseHeadersSize;
431431

432432
this.dispatchEventToListeners("requestHeaders changed");
@@ -435,8 +435,8 @@ WebInspector.Resource.prototype = {
435435
get requestHeadersSize()
436436
{
437437
if (typeof(this._requestHeadersSize) === "undefined") {
438-
if (this._rawRequestHeadersText)
439-
this._requestHeadersSize = this._rawRequestHeadersText.length;
438+
if (this._requestHeadersText)
439+
this._requestHeadersSize = this._requestHeadersText.length;
440440
else
441441
this._requestHeadersSize = this._headersSize(this._requestHeaders)
442442
}
@@ -494,14 +494,14 @@ WebInspector.Resource.prototype = {
494494
this.dispatchEventToListeners("responseHeaders changed");
495495
},
496496

497-
get rawResponseHeadersText()
497+
get responseHeadersText()
498498
{
499-
return this._rawResponseHeadersText;
499+
return this._responseHeadersText;
500500
},
501501

502-
set rawResponseHeadersText(x)
502+
set responseHeadersText(x)
503503
{
504-
this._rawResponseHeadersText = x;
504+
this._responseHeadersText = x;
505505
delete this._responseHeadersSize;
506506

507507
this.dispatchEventToListeners("responseHeaders changed");
@@ -510,8 +510,8 @@ WebInspector.Resource.prototype = {
510510
get responseHeadersSize()
511511
{
512512
if (typeof(this._responseHeadersSize) === "undefined") {
513-
if (this._rawResponseHeadersText)
514-
this._responseHeadersSize = this._rawResponseHeadersText.length;
513+
if (this._responseHeadersText)
514+
this._responseHeadersSize = this._responseHeadersText.length;
515515
else
516516
this._responseHeadersSize = this._headersSize(this._responseHeaders)
517517
}
@@ -597,7 +597,7 @@ WebInspector.Resource.prototype = {
597597
_headersSize: function(headers)
598598
{
599599
// We should take actual headers size from network stack, when possible, but fall back to
600-
// this lousy computation when no raw headers are available.
600+
// this lousy computation when no headers text is available.
601601
var size = 0;
602602
for (var header in headers)
603603
size += header.length + headers[header].length + 4; // _typical_ overhead per header is ": ".length + "\r\n".length.

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ WebInspector.ResourceHeadersView = function(resource)
6161

6262
this._decodeRequestParameters = true;
6363

64-
this._showRawRequestHeadersText = false;
65-
this._showRawResponseHeadersText = false;
64+
this._showRequestHeadersText = false;
65+
this._showResponseHeadersText = false;
6666

6767
this._queryStringTreeElement = new TreeElement("", null, true);
6868
this._queryStringTreeElement.expanded = true;
@@ -214,14 +214,14 @@ WebInspector.ResourceHeadersView.prototype = {
214214
var additionalRow = null;
215215
if (typeof this._resource.webSocketRequestKey3 !== "undefined")
216216
additionalRow = {header: "(Key3)", value: this._resource.webSocketRequestKey3};
217-
if (this._showRawRequestHeadersText)
218-
this._refreshRawHeadersText(WebInspector.UIString("Request Headers"), this._resource.rawRequestHeadersText, this._requestHeadersTreeElement);
217+
if (this._showRequestHeadersText)
218+
this._refreshHeadersText(WebInspector.UIString("Request Headers"), this._resource.requestHeadersText, this._requestHeadersTreeElement);
219219
else
220220
this._refreshHeaders(WebInspector.UIString("Request Headers"), this._resource.sortedRequestHeaders, additionalRow, this._requestHeadersTreeElement);
221221

222-
if (this._resource.rawRequestHeadersText) {
223-
var toggleButton = this._createHeadersToggleButton(this._showRawRequestHeadersText);
224-
toggleButton.addEventListener("click", this._toggleRawRequestHeadersText.bind(this));
222+
if (this._resource.requestHeadersText) {
223+
var toggleButton = this._createHeadersToggleButton(this._showRequestHeadersText);
224+
toggleButton.addEventListener("click", this._toggleRequestHeadersText.bind(this));
225225
this._requestHeadersTreeElement.listItemElement.appendChild(toggleButton);
226226
}
227227

@@ -233,14 +233,14 @@ WebInspector.ResourceHeadersView.prototype = {
233233
var additionalRow = null;
234234
if (typeof this._resource.webSocketChallengeResponse !== "undefined")
235235
additionalRow = {header: "(Challenge Response)", value: this._resource.webSocketChallengeResponse};
236-
if (this._showRawResponseHeadersText)
237-
this._refreshRawHeadersText(WebInspector.UIString("Response Headers"), this._resource.rawResponseHeadersText, this._responseHeadersTreeElement);
236+
if (this._showResponseHeadersText)
237+
this._refreshHeadersText(WebInspector.UIString("Response Headers"), this._resource.responseHeadersText, this._responseHeadersTreeElement);
238238
else
239239
this._refreshHeaders(WebInspector.UIString("Response Headers"), this._resource.sortedResponseHeaders, additionalRow, this._responseHeadersTreeElement);
240240

241-
if (this._resource.rawResponseHeadersText) {
242-
var toggleButton = this._createHeadersToggleButton(this._showRawResponseHeadersText);
243-
toggleButton.addEventListener("click", this._toggleRawResponseHeadersText.bind(this));
241+
if (this._resource.responseHeadersText) {
242+
var toggleButton = this._createHeadersToggleButton(this._showResponseHeadersText);
243+
toggleButton.addEventListener("click", this._toggleResponseHeadersText.bind(this));
244244
this._responseHeadersTreeElement.listItemElement.appendChild(toggleButton);
245245
}
246246
},
@@ -273,12 +273,12 @@ WebInspector.ResourceHeadersView.prototype = {
273273
}
274274
},
275275

276-
_refreshHeadersTitle: function(title, headersTreeElement, isRawHeadersTextShown, headersLength)
276+
_refreshHeadersTitle: function(title, headersTreeElement, isHeadersTextShown, headersLength)
277277
{
278278
headersTreeElement.listItemElement.removeChildren();
279279
headersTreeElement.listItemElement.appendChild(document.createTextNode(title));
280280

281-
if (!isRawHeadersTextShown) {
281+
if (!isHeadersTextShown) {
282282
var headerCount = document.createElement("span");
283283
headerCount.addStyleClass("header-count");
284284
headerCount.textContent = WebInspector.UIString(" (%d)", headersLength);
@@ -314,32 +314,32 @@ WebInspector.ResourceHeadersView.prototype = {
314314
}
315315
},
316316

317-
_refreshRawHeadersText: function(title, rawHeadersText, headersTreeElement)
317+
_refreshHeadersText: function(title, headersText, headersTreeElement)
318318
{
319319
headersTreeElement.removeChildren();
320320

321321
this._refreshHeadersTitle(title, headersTreeElement, true);
322322
var headerTreeElement = new TreeElement(null, null, false);
323323
headerTreeElement.selectable = false;
324324
headersTreeElement.appendChild(headerTreeElement);
325-
headerTreeElement.listItemElement.addStyleClass("raw-headers-text");
325+
headerTreeElement.listItemElement.addStyleClass("headers-text");
326326

327-
var rawHeadersTextElement = document.createElement("span");
328-
rawHeadersTextElement.addStyleClass("header-value");
329-
rawHeadersTextElement.addStyleClass("source-code");
330-
rawHeadersTextElement.textContent = String(rawHeadersText).trim();
331-
headerTreeElement.listItemElement.appendChild(rawHeadersTextElement);
327+
var headersTextElement = document.createElement("span");
328+
headersTextElement.addStyleClass("header-value");
329+
headersTextElement.addStyleClass("source-code");
330+
headersTextElement.textContent = String(headersText).trim();
331+
headerTreeElement.listItemElement.appendChild(headersTextElement);
332332
},
333333

334-
_toggleRawRequestHeadersText: function(event)
334+
_toggleRequestHeadersText: function(event)
335335
{
336-
this._showRawRequestHeadersText = !this._showRawRequestHeadersText;
336+
this._showRequestHeadersText = !this._showRequestHeadersText;
337337
this._refreshRequestHeaders();
338338
},
339339

340-
_toggleRawResponseHeadersText: function(event)
340+
_toggleResponseHeadersText: function(event)
341341
{
342-
this._showRawResponseHeadersText = !this._showRawResponseHeadersText;
342+
this._showResponseHeadersText = !this._showResponseHeadersText;
343343
this._refreshResponseHeaders();
344344
},
345345

@@ -351,9 +351,9 @@ WebInspector.ResourceHeadersView.prototype = {
351351
return button;
352352
},
353353

354-
_createHeadersToggleButton: function(isRawHeadersTextShown)
354+
_createHeadersToggleButton: function(isHeadersTextShown)
355355
{
356-
var toggleTitle = isRawHeadersTextShown ? WebInspector.UIString("view parsed") : WebInspector.UIString("view source");
356+
var toggleTitle = isHeadersTextShown ? WebInspector.UIString("view parsed") : WebInspector.UIString("view source");
357357
return this._createToggleButton(toggleTitle);
358358
}
359359
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@
747747
margin-top: 1px;
748748
}
749749

750-
.resource-headers-view .outline-disclosure li.raw-headers-text {
750+
.resource-headers-view .outline-disclosure li.headers-text {
751751
text-indent: 0;
752752
margin-left: -2px;
753753
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ struct ResourceLoadInfo : RefCounted<ResourceLoadInfo> {
4141
long long encodedDataLength;
4242
HTTPHeaderMap requestHeaders;
4343
HTTPHeaderMap responseHeaders;
44-
String rawRequestHeadersText;
45-
String rawResponseHeadersText;
44+
String requestHeadersText;
45+
String responseHeadersText;
4646
};
4747

4848
}

‎Source/WebKit/chromium/ChangeLog‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2011-04-15 Vsevolod Vlasov <vsevik@chromium.org>
2+
3+
Reviewed by Pavel Feldman.
4+
5+
Web Inspector: Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText
6+
https://bugs.webkit.org/show_bug.cgi?id=58650
7+
8+
* public/WebHTTPLoadInfo.h:
9+
* src/WebHTTPLoadInfo.cpp:
10+
(WebKit::WebHTTPLoadInfo::requestHeadersText):
11+
(WebKit::WebHTTPLoadInfo::setRequestHeadersText):
12+
(WebKit::WebHTTPLoadInfo::responseHeadersText):
13+
(WebKit::WebHTTPLoadInfo::setResponseHeadersText):
14+
115
2011-04-15 Zelidrag Hornung <zelidrag@chromium.org>
216

317
Reviewed by Darin Fisher.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ class WebHTTPLoadInfo {
6868
WEBKIT_API void addRequestHeader(const WebString& name, const WebString& value);
6969
WEBKIT_API void addResponseHeader(const WebString& name, const WebString& value);
7070

71-
WEBKIT_API WebString rawRequestHeadersText() const;
72-
WEBKIT_API void setRawRequestHeadersText(const WebString&);
71+
WEBKIT_API WebString requestHeadersText() const;
72+
WEBKIT_API void setRequestHeadersText(const WebString&);
7373

74-
WEBKIT_API WebString rawResponseHeadersText() const;
75-
WEBKIT_API void setRawResponseHeadersText(const WebString&);
74+
WEBKIT_API WebString responseHeadersText() const;
75+
WEBKIT_API void setResponseHeadersText(const WebString&);
7676

7777
#if WEBKIT_IMPLEMENTATION
7878
WebHTTPLoadInfo(WTF::PassRefPtr<WebCore::ResourceLoadInfo>);

0 commit comments

Comments
 (0)