Skip to content

Commit 27d85a5

Browse files
author
caseq@chromium.org
committed
2011-08-01 Andrey Kosyakov <caseq@chromium.org>
Web Inspector: [Extensions API] webInspector.inspectedPage.reload() is broken https://bugs.webkit.org/show_bug.cgi?id=65476 - fixed webInspector.inspectedWindow.reload(), brought tests back. - removed redundant setting of user agent in FrameLoader::loadResourceSynchronously() Reviewed by Yury Semikhatsky. Test: http/tests/inspector/extensions-useragent.html * inspector/front-end/ExtensionServer.js: (WebInspector.ExtensionServer.prototype._onReload): * loader/FrameLoader.cpp: (WebCore::FrameLoader::loadResourceSynchronously): 2011-08-01 Andrey Kosyakov <caseq@chromium.org> Web Inspector: [Extensions API] webInspector.inspectedPage.reload() is broken https://bugs.webkit.org/show_bug.cgi?id=65476 Reviewed by Yury Semikhatsky. * http/tests/inspector/extensions-useragent-expected.txt: Added. * http/tests/inspector/extensions-useragent.html: Added. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@92187 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 82925d2 commit 27d85a5

7 files changed

Lines changed: 109 additions & 2 deletions

File tree

LayoutTests/ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2011-08-01 Andrey Kosyakov <caseq@chromium.org>
2+
3+
Web Inspector: [Extensions API] webInspector.inspectedPage.reload() is broken
4+
https://bugs.webkit.org/show_bug.cgi?id=65476
5+
6+
Reviewed by Yury Semikhatsky.
7+
8+
* http/tests/inspector/extensions-useragent-expected.txt: Added.
9+
* http/tests/inspector/extensions-useragent.html: Added.
10+
111
2011-08-02 Pavel Feldman <pfeldman@chromium.org>
212

313
Not reviewed: fixing inspector tests.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Tests WebInspector extension API
2+
3+
Started extension.
4+
Running tests...
5+
RUNNING TEST: extension_testUserAgent
6+
Page reloaded.
7+
Page reloaded.
8+
user-agent header for extensions-useragent.html: Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)
9+
user-agent header for xhr-exists.html: Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)
10+
navigator.userAgent: Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)
11+
All tests done.
12+
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<html>
2+
<head>
3+
<script src="inspector-test.js"></script>
4+
<script src="extensions-test.js"></script>
5+
<script type="text/javascript">
6+
7+
function extension_testUserAgent(nextTest)
8+
{
9+
const resourcesToCheck = [
10+
"extensions-useragent.html",
11+
"xhr-exists.html"
12+
];
13+
var resourceCount = 0;
14+
var queuedOutput = [];
15+
16+
function onResource(resource)
17+
{
18+
var url = resource.request.url.replace(/^.*[/]/, "");
19+
if (resourcesToCheck.indexOf(url) < 0)
20+
return;
21+
22+
queuedOutput.push("user-agent header for " + url + ": " + getHeader(resource.request.headers, "user-agent"));
23+
if (++resourceCount < resourcesToCheck.length)
24+
return;
25+
webInspector.resources.onFinished.removeListener(onResource);
26+
webInspector.inspectedWindow.eval("navigator.userAgent", onEval);
27+
}
28+
function getHeader(headers, name)
29+
{
30+
for (var i = 0; i < headers.length; ++i) {
31+
if (headers[i].name.toLowerCase() === name)
32+
return headers[i].value;
33+
}
34+
}
35+
function onEval(result)
36+
{
37+
queuedOutput.push("navigator.userAgent: " + result);
38+
webInspector.inspectedWindow.eval("", cleanUp);
39+
}
40+
function cleanUp()
41+
{
42+
evaluateOnFrontend("InspectorTest.runWhenPageLoads(reply)", onPageLoaded);
43+
webInspector.inspectedWindow.reload("");
44+
}
45+
function onPageLoaded()
46+
{
47+
for (var i = 0; i < queuedOutput.length; ++i)
48+
output(queuedOutput[i]);
49+
nextTest();
50+
}
51+
52+
webInspector.resources.onFinished.addListener(onResource);
53+
webInspector.inspectedWindow.reload("Mozilla/4.0 (compatible; WebInspector Extension User-Agent override; RSX-11M)");
54+
}
55+
56+
(function()
57+
{
58+
var xhr = new XMLHttpRequest();
59+
xhr.open("GET", "resources/xhr-exists.html", false);
60+
xhr.send(null);
61+
})();
62+
63+
</script>
64+
</head>
65+
<body onload="runTest()">
66+
<p>Tests WebInspector extension API</p>
67+
</body>
68+
</html>

LayoutTests/platform/chromium/test_expectations.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@ BUGWK58013 SKIP : compositing/scaling/tiled-layer-recursion.html = FAIL
606606
WONTFIX SKIP : inspector/extensions = FAIL
607607
WONTFIX SKIP : http/tests/inspector/extensions-headers.html = FAIL
608608
WONTFIX SKIP : http/tests/inspector/extensions-resources-redirect.html = FAIL
609+
WONTFIX SKIP : http/tests/inspector/extensions-useragent.html = FAIL
609610

610611
// There is no enough plugins support in DRT
611612
WONTFIX SKIP : http/tests/inspector/network/network-embed.html = FAIL

Source/WebCore/ChangeLog

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2011-08-01 Andrey Kosyakov <caseq@chromium.org>
2+
3+
Web Inspector: [Extensions API] webInspector.inspectedPage.reload() is broken
4+
https://bugs.webkit.org/show_bug.cgi?id=65476
5+
6+
- fixed webInspector.inspectedWindow.reload(), brought tests back.
7+
- removed redundant setting of user agent in FrameLoader::loadResourceSynchronously()
8+
9+
Reviewed by Yury Semikhatsky.
10+
11+
Test: http/tests/inspector/extensions-useragent.html
12+
13+
* inspector/front-end/ExtensionServer.js:
14+
(WebInspector.ExtensionServer.prototype._onReload):
15+
* loader/FrameLoader.cpp:
16+
(WebCore::FrameLoader::loadResourceSynchronously):
17+
118
2011-08-02 Pavel Feldman <pfeldman@chromium.org>
219

320
Not reviewed: fixing inspector tests.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ WebInspector.ExtensionServer.prototype = {
273273
_onReload: function(message)
274274
{
275275
if (typeof message.userAgent === "string")
276-
PageAgent.setUserAgentOverride(message.userAgent);
276+
NetworkAgent.setUserAgentOverride(message.userAgent);
277277

278278
PageAgent.reload(false);
279279
return this._status.OK();

Source/WebCore/loader/FrameLoader.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2579,7 +2579,6 @@ unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& requ
25792579

25802580
if (Page* page = m_frame->page())
25812581
initialRequest.setFirstPartyForCookies(page->mainFrame()->loader()->documentLoader()->request().url());
2582-
initialRequest.setHTTPUserAgent(client()->userAgent(request.url()));
25832582

25842583
addExtraFieldsToSubresourceRequest(initialRequest);
25852584

0 commit comments

Comments
 (0)