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

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 8095007: Defer loading of audio/video tags while prerendering. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressing Andrew's comments Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <deque> 5 #include <deque>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1229 } 1229 }
1230 } 1230 }
1231 EXPECT_EQ(0, num_prerender_tabs); 1231 EXPECT_EQ(0, num_prerender_tabs);
1232 1232
1233 // We may have deleted the prerender tab, but the swapped in tab should be 1233 // We may have deleted the prerender tab, but the swapped in tab should be
1234 // active. 1234 // active.
1235 EXPECT_GE(num_tabs_with_prerender_page_title, 1); 1235 EXPECT_GE(num_tabs_with_prerender_page_title, 1);
1236 EXPECT_LE(num_tabs_with_prerender_page_title, 2); 1236 EXPECT_LE(num_tabs_with_prerender_page_title, 2);
1237 } 1237 }
1238 1238
1239 // Checks that prerenderers will terminate when an audio tag is encountered. 1239 // Checks that prerenderers will work when an audio tag is encountered.
1240 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Audio) { 1240 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Audio) {
1241 PrerenderTestURL("files/prerender/prerender_html5_audio.html", 1241 PrerenderTestURL("files/prerender/prerender_html5_audio.html",
1242 FINAL_STATUS_HTML5_MEDIA, 1242 FINAL_STATUS_USED,
1243 1); 1243 1);
1244 NavigateToDestURL();
1244 } 1245 }
1245 1246
1246 // Checks that prerenderers will terminate when a video tag is encountered. 1247 // Checks that prerenderers will work when a video tag is encountered.
1247 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Video) { 1248 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Video) {
1248 PrerenderTestURL("files/prerender/prerender_html5_video.html", 1249 PrerenderTestURL("files/prerender/prerender_html5_video.html",
1249 FINAL_STATUS_HTML5_MEDIA, 1250 FINAL_STATUS_USED,
1250 1); 1251 1);
1252 NavigateToDestURL();
1251 } 1253 }
1252 1254
1253 // Checks that prerenderers will terminate when a video tag is inserted via 1255 // Checks that prerenderers will be used when a video tag is inserted via
1254 // javascript. 1256 // javascript.
1255 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoJs) { 1257 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoJs) {
1256 PrerenderTestURL("files/prerender/prerender_html5_video_script.html", 1258 PrerenderTestURL("files/prerender/prerender_html5_video_script.html",
1257 FINAL_STATUS_HTML5_MEDIA, 1259 FINAL_STATUS_USED,
1258 1); 1260 1);
1261 NavigateToDestURL();
1259 } 1262 }
1260 1263
1261 // Checks that scripts can retrieve the correct window size while prerendering. 1264 // Checks that scripts can retrieve the correct window size while prerendering.
1262 #if defined(TOOLKIT_VIEWS) 1265 #if defined(TOOLKIT_VIEWS)
1263 // TODO(beng): Widget hierarchy split causes this to fail http://crbug.com/82363 1266 // TODO(beng): Widget hierarchy split causes this to fail http://crbug.com/82363
1264 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderWindowSize) { 1267 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderWindowSize) {
1265 #else 1268 #else
1266 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) { 1269 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) {
1267 #endif 1270 #endif
1268 PrerenderTestURL("files/prerender/prerender_size.html", 1271 PrerenderTestURL("files/prerender/prerender_size.html",
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 RenderViewHost* inspected_rvh = tab_contents->render_view_host(); 1859 RenderViewHost* inspected_rvh = tab_contents->render_view_host();
1857 DevToolsManager* manager = DevToolsManager::GetInstance(); 1860 DevToolsManager* manager = DevToolsManager::GetInstance();
1858 FakeDevToolsClientHost client_host; 1861 FakeDevToolsClientHost client_host;
1859 manager->RegisterDevToolsClientHostFor(inspected_rvh, &client_host); 1862 manager->RegisterDevToolsClientHostFor(inspected_rvh, &client_host);
1860 const char* url = "files/prerender/prerender_page.html"; 1863 const char* url = "files/prerender/prerender_page.html";
1861 PrerenderTestURL(url, FINAL_STATUS_DEVTOOLS_ATTACHED, 1); 1864 PrerenderTestURL(url, FINAL_STATUS_DEVTOOLS_ATTACHED, 1);
1862 NavigateToURL(url); 1865 NavigateToURL(url);
1863 } 1866 }
1864 1867
1865 } // namespace prerender 1868 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_renderer.gypi » ('j') | chrome/renderer/prerender/prerender_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698