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

Unified Diff: chrome/test/data/prerender/prerender_html5_common.js

Issue 9860027: Remove DemuxerFactory and URL parameter from Pipeline. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fix prerender Created 8 years, 9 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
« no previous file with comments | « no previous file | media/base/demuxer.h » ('j') | media/base/pipeline.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/prerender/prerender_html5_common.js
diff --git a/chrome/test/data/prerender/prerender_html5_common.js b/chrome/test/data/prerender/prerender_html5_common.js
index 09d196b4744c3b9fb631a7009b318c0912807461..7779c5a48693d663e841f4f7dbbd05f02cb2b7ca 100644
--- a/chrome/test/data/prerender/prerender_html5_common.js
+++ b/chrome/test/data/prerender/prerender_html5_common.js
@@ -20,7 +20,6 @@ function assert(bool) {
var canPlaySeen = false;
var playingSeen = false;
var canPlayThroughSeen = false;
-var stalledSeen = false;
var loadStartSeen = false;
var hasError = false;
@@ -49,16 +48,16 @@ function mediaEventHandler(e) {
loadStartSeen = true;
break;
case 'stalled':
- assert(loadStartSeen);
- stalledSeen = true;
+ // We should never see a stalled event during the display portion of the
+ // test.
+ assert(false);
scherkus (not reviewing) 2012/03/28 00:24:34 shishir: can you take a look at this?
Shishir 2012/03/28 18:41:33 From the webkit code (third_party/WebKit/Source/We
scherkus (not reviewing) 2012/03/30 21:40:45 This CL apparently fixes that behaviour, which I w
break;
}
- var stallDone = !testNetworkEvents || stalledSeen;
var progressDone = (willPlay && canPlayThroughSeen && playingSeen) ||
(!willPlay && canPlayThroughSeen && !playingSeen);
- if (stallDone && progressDone)
+ if (progressDone)
document.title = 'PASS';
}
« no previous file with comments | « no previous file | media/base/demuxer.h » ('j') | media/base/pipeline.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698