[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
caseq at chromium.org
caseq at chromium.org
Fri Jan 21 14:44:24 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 1562cd99486eea9bba7d6f253e5efd5838a2b917
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 28 18:11:13 2010 +0000
2010-12-28 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: [Chromium] Expose extension API to select a node in WebInspector
Do not request content for resources with non-numeric identifiers.
https://bugs.webkit.org/show_bug.cgi?id=49727
Test: http/tests/inspector/extensions-resources-redirect.html
* inspector/front-end/NetworkManager.js:
(WebInspector.NetworkManager.prototype._appendRedirect):
2010-12-28 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: [Chromium] Expose extension API to select a node in WebInspector
Do not request content for resources with non-numeric identifiers.
https://bugs.webkit.org/show_bug.cgi?id=49727
* http/tests/inspector/extensions-resources-redirect-expected.txt: Added.
* http/tests/inspector/extensions-resources-redirect.html: Added.
* http/tests/inspector/extensions-resources-test.js: Added.
(extension_getResourceByUrl.onHAR):
(extension_getResourceByUrl):
* inspector/extensions-resources-expected.txt:
* inspector/extensions-resources.html:
* platform/mac-leopard/inspector/extensions-resources-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74714 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 552bfce..4a394c0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-28 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: [Chromium] Expose extension API to select a node in WebInspector
+ Do not request content for resources with non-numeric identifiers.
+ https://bugs.webkit.org/show_bug.cgi?id=49727
+
+ * http/tests/inspector/extensions-resources-redirect-expected.txt: Added.
+ * http/tests/inspector/extensions-resources-redirect.html: Added.
+ * http/tests/inspector/extensions-resources-test.js: Added.
+ (extension_getResourceByUrl.onHAR):
+ (extension_getResourceByUrl):
+ * inspector/extensions-resources-expected.txt:
+ * inspector/extensions-resources.html:
+ * platform/mac-leopard/inspector/extensions-resources-expected.txt:
+
2010-12-28 Kenneth Russell <kbr at google.com>
Unreviewed, Chromium test expectations update. Coalesce WebGL
diff --git a/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt b/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt
new file mode 100644
index 0000000..e8c7b35
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt
@@ -0,0 +1,9 @@
+Tests WebInspector extension API
+
+Started extension.
+
+Running tests...
+RUNNING TEST: extension_testGetRedirectResourceContent
+content: , encoding: base64
+All tests done.
+
diff --git a/LayoutTests/http/tests/inspector/extensions-resources-redirect.html b/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
new file mode 100755
index 0000000..c3b9479
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
@@ -0,0 +1,39 @@
+<html>
+<head>
+<script src="inspector-test2.js"></script>
+<script src="extensions-resources-test.js"></script>
+<script src="extensions-test.js"></script>
+<script type="text/javascript">
+
+function extension_testGetRedirectResourceContent(nextTest)
+{
+ function onFinished()
+ {
+ extension_getResourceByUrl([ /redirect-methods-result.php\?status=302$/ ], function(resource) {
+ resource.getContent(onContent)
+ });
+ }
+ function onContent(content, encoding)
+ {
+ output("content: " + content + ", encoding: " + encoding);
+ nextTest();
+ }
+
+ webInspector.resources.onFinished.addListener(onFinished);
+ webInspector.inspectedWindow.eval("doRequest()");
+}
+
+function doRequest()
+{
+ // We can't use XHR here -- the content for XHRs is pushed from back-end.
+ var iframe = document.createElement("iframe");
+ iframe.src = "/loading/resources/redirect-methods-result.php?status=302";
+ document.body.appendChild(iframe);
+}
+
+</script>
+</head>
+<body onload="runTest()">
+<p>Tests WebInspector extension API</p>
+</body>
+</html>
diff --git a/LayoutTests/http/tests/inspector/extensions-resources-test.js b/LayoutTests/http/tests/inspector/extensions-resources-test.js
new file mode 100755
index 0000000..66dad74
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/extensions-resources-test.js
@@ -0,0 +1,16 @@
+function extension_getResourceByUrl(urls, callback)
+{
+ function onHAR(response)
+ {
+ var entries = response.entries;
+ for (var i = 0; i < entries.length; ++i) {
+ for (var url = 0; url < urls.length; ++url) {
+ if (urls[url].test(entries[i].request.url)) {
+ callback(entries[i]);
+ return;
+ }
+ }
+ }
+ }
+ webInspector.resources.getHAR(onHAR);
+}
diff --git a/LayoutTests/inspector/extensions-resources-expected.txt b/LayoutTests/inspector/extensions-resources-expected.txt
index adb4b30..7518dc5 100644
--- a/LayoutTests/inspector/extensions-resources-expected.txt
+++ b/LayoutTests/inspector/extensions-resources-expected.txt
@@ -5,6 +5,7 @@ Page reloaded.
Started extension.
Running tests...
RUNNING TEST: extension_testGetHAR
+resource: .../tests/inspector/extensions-resources-test.js
resource: .../tests/inspector/extensions-test.js
resource: .../tests/inspector/inspector-test2.js
resource: .../LayoutTests/inspector/extensions-resources.html
diff --git a/LayoutTests/inspector/extensions-resources.html b/LayoutTests/inspector/extensions-resources.html
index bd208b9..0b50d1a 100755
--- a/LayoutTests/inspector/extensions-resources.html
+++ b/LayoutTests/inspector/extensions-resources.html
@@ -12,6 +12,7 @@ p { font-family: 'test'; }
<script src="../http/tests/inspector/inspector-test2.js"></script>
<script src="../http/tests/inspector/extensions-test.js"></script>
+<script src="../http/tests/inspector/extensions-resources-test.js"></script>
<script type="text/javascript">
function extension_testGetHAR(nextTest)
@@ -56,23 +57,6 @@ function extension_testResourceNotification(nextTest)
extension_doXHR();
}
-function extension_getResourceByUrl(urls, callback)
-{
- function onHAR(response)
- {
- var entries = response.entries;
- for (var i = 0; i < entries.length; ++i) {
- for (var url = 0; url < urls.length; ++url) {
- if (urls[url].test(entries[i].request.url)) {
- callback(entries[i]);
- return;
- }
- }
- }
- }
- webInspector.resources.getHAR(onHAR);
-}
-
function extension_onResourceBody(content, encoding)
{
dumpObject(Array.prototype.slice.call(arguments));
diff --git a/LayoutTests/platform/mac-leopard/inspector/extensions-resources-expected.txt b/LayoutTests/platform/mac-leopard/inspector/extensions-resources-expected.txt
index d8f9d1b..74c2614 100755
--- a/LayoutTests/platform/mac-leopard/inspector/extensions-resources-expected.txt
+++ b/LayoutTests/platform/mac-leopard/inspector/extensions-resources-expected.txt
@@ -5,6 +5,7 @@ Page reloaded.
Started extension.
Running tests...
RUNNING TEST: extension_testGetHAR
+resource: .../tests/inspector/extensions-resources-test.js
resource: .../tests/inspector/extensions-test.js
resource: .../tests/inspector/inspector-test2.js
resource: .../LayoutTests/inspector/extensions-resources.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 86fe5d9..c81ffd2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-28 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: [Chromium] Expose extension API to select a node in WebInspector
+ Do not request content for resources with non-numeric identifiers.
+ https://bugs.webkit.org/show_bug.cgi?id=49727
+
+ Test: http/tests/inspector/extensions-resources-redirect.html
+
+ * inspector/front-end/NetworkManager.js:
+ (WebInspector.NetworkManager.prototype._appendRedirect):
+
2010-12-28 Ilya Tikhonovsky <loislo at chromium.org>
Unreviewed build fix for Qt.
diff --git a/WebCore/inspector/front-end/NetworkManager.js b/WebCore/inspector/front-end/NetworkManager.js
index b8cd481..b1ec97c 100644
--- a/WebCore/inspector/front-end/NetworkManager.js
+++ b/WebCore/inspector/front-end/NetworkManager.js
@@ -286,6 +286,7 @@ WebInspector.NetworkManager.prototype = {
_appendRedirect: function(identifier, redirectURL)
{
var originalResource = this._resourcesById[identifier];
+ originalResource.finished = true;
originalResource.identifier = null;
var newResource = this._createResource(identifier, redirectURL, originalResource.loader, originalResource.stackTrace);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list