Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: LayoutTests/inspector/timeline/timeline-network-received-data.html

Issue 399043002: DevTools: switch Timeline frontend into buffered mode and remove the corresponding experiment. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: minor changes Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/inspector/timeline/timeline-network-received-data.html
diff --git a/LayoutTests/inspector/timeline/timeline-network-received-data.html b/LayoutTests/inspector/timeline/timeline-network-received-data.html
index 9dea941fdeb0924dfa7a8dd75109a7590d1e7ca7..b9fd5bf4d27f7e23c46fa199882c8597f0b0a281 100644
--- a/LayoutTests/inspector/timeline/timeline-network-received-data.html
+++ b/LayoutTests/inspector/timeline/timeline-network-received-data.html
@@ -4,53 +4,46 @@
<script src="../../http/tests/inspector/timeline-test.js"></script>
<script>
-function performActions()
+function performActions(callback)
{
+ function onImageLoad()
+ {
+ window._imageLoaded = true;
+ if (window._scriptEvaluated)
+ callback();
+ }
+
+ function scriptEvaluated()
+ {
+ window._scriptEvaluated = true;
yurys 2014/07/17 10:42:24 may be use callback counter?
+ if (window._imageLoaded)
+ callback();
+ }
+
var image = new Image();
+ image.onload = onImageLoad;
image.src = "resources/anImage.png";
var script = document.createElement("script");
script.src = "timeline-network-resource.js";
document.body.appendChild(script);
+
+ window.timelineNetworkResourceEvaluated = scriptEvaluated;
}
function test()
{
- var callbackBarrier = new CallbackBarrier();
- var resourceReceivedCallback = callbackBarrier.createCallback();
- // It will be called from timeline-network-resource.js script by evaluateInWebInspector call.
- InspectorTest.scriptEvaluated = callbackBarrier.createCallback();
- callbackBarrier.callWhenDone(done);
+ InspectorTest.invokeAsyncWithTimeline("performActions", done);
function done()
{
InspectorTest.addResult("Script evaluated.");
- InspectorTest.addResult("Resource received data has length, test passed.");
- InspectorTest.completeTest();
- }
-
- var calledOnce;
-
- InspectorTest.startTimeline(function() {
- InspectorTest.evaluateInPage("performActions()");
- });
-
- InspectorTest.waitForRecordType("ResourceReceivedData", finish);
-
- function finish(object)
- {
- for (var prop in object) {
- if (!InspectorTest.timelinePropertyFormatters[prop]) {
- for (var property in object[prop]) {
- if (property === "encodedDataLength") {
- if (!calledOnce) {
- calledOnce = true;
- resourceReceivedCallback();
- }
- return;
- }
- }
- }
+ var filteredRecords = InspectorTest.filterTimelineRecords("ResourceReceivedData");
yurys 2014/07/17 10:42:24 filterTimelineRecords("ResourceReceivedData", true
+ if (filteredRecords.length) {
+ var record = filteredRecords[0];
+ if (record.data && record.data && typeof record.data.encodedDataLength === "number")
+ InspectorTest.addResult("Resource received data has length, test passed.");
}
+ InspectorTest.completeTest();
}
}

Powered by Google App Engine
This is Rietveld 408576698