summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/js
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/chromium/src/js
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/chromium/src/js')
-rw-r--r--Source/WebKit/chromium/src/js/Tests.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/chromium/src/js/Tests.js b/Source/WebKit/chromium/src/js/Tests.js
index b8dc8de50..8c7e26ab4 100644
--- a/Source/WebKit/chromium/src/js/Tests.js
+++ b/Source/WebKit/chromium/src/js/Tests.js
@@ -404,7 +404,7 @@ TestSuite.prototype.testNetworkSize = function()
test.releaseControl();
}
- this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishResource", finishResource);
+ this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishNetworkRequest", finishResource);
// Reload inspected page to sniff network events
test.evaluateInConsole_("window.location.reload(true);", function(resultText) {});
@@ -427,7 +427,7 @@ TestSuite.prototype.testNetworkSyncSize = function()
test.releaseControl();
}
- this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishResource", finishResource);
+ this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishNetworkRequest", finishResource);
// Send synchronous XHR to sniff network events
test.evaluateInConsole_("var xhr = new XMLHttpRequest(); xhr.open(\"GET\", \"chunked\", false); xhr.send(null);", function() {});
@@ -451,7 +451,7 @@ TestSuite.prototype.testNetworkRawHeadersText = function()
test.releaseControl();
}
- this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishResource", finishResource);
+ this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishNetworkRequest", finishResource);
// Reload inspected page to sniff network events
test.evaluateInConsole_("window.location.reload(true);", function(resultText) {});
@@ -485,7 +485,7 @@ TestSuite.prototype.testNetworkTiming = function()
test.releaseControl();
}
- this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishResource", finishResource);
+ this.addSniffer(WebInspector.NetworkDispatcher.prototype, "_finishNetworkRequest", finishResource);
// Reload inspected page to sniff network events
test.evaluateInConsole_("window.location.reload(true);", function(resultText) {});
@@ -688,7 +688,7 @@ TestSuite.prototype._scriptsAreParsed = function(expected)
var missing = expected.slice(0);
for (var i = 0; i < uiSourceCodes.length; ++i) {
for (var j = 0; j < missing.length; ++j) {
- if (uiSourceCodes[i].fileName.search(missing[j]) !== -1) {
+ if (uiSourceCodes[i].parsedURL.lastPathComponent.search(missing[j]) !== -1) {
missing.splice(j, 1);
break;
}