Chromium Code Reviews| Index: chrome/browser/prerender/prerender_manager.cc |
| diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc |
| index 60cdd13904c785ede93b57e1245da33b285de263..a08e2897b731487ac2b4b98e72f417c442e676c9 100644 |
| --- a/chrome/browser/prerender/prerender_manager.cc |
| +++ b/chrome/browser/prerender/prerender_manager.cc |
| @@ -235,8 +235,8 @@ PrerenderManager::AddPrerenderFromLinkRelPrerender( |
| source_web_contents->GetController() |
| .GetDefaultSessionStorageNamespace(); |
| } |
| - |
| - return AddPrerender(origin, url, referrer, size, session_storage_namespace); |
| + return AddPrerender( |
| + origin, url, referrer, gfx::Rect(size), session_storage_namespace); |
|
mmenke
2016/08/19 15:22:29
Need to include the header for gfx::Rect (Hrm...no
Yusuf
2016/08/19 17:20:33
Done.
|
| } |
| std::unique_ptr<PrerenderHandle> PrerenderManager::AddPrerenderFromOmnibox( |
| @@ -245,7 +245,7 @@ std::unique_ptr<PrerenderHandle> PrerenderManager::AddPrerenderFromOmnibox( |
| const gfx::Size& size) { |
| if (!IsOmniboxEnabled(profile_)) |
| return nullptr; |
| - return AddPrerender(ORIGIN_OMNIBOX, url, content::Referrer(), size, |
| + return AddPrerender(ORIGIN_OMNIBOX, url, content::Referrer(), gfx::Rect(size), |
| session_storage_namespace); |
| } |
| @@ -254,9 +254,9 @@ PrerenderManager::AddPrerenderFromExternalRequest( |
| const GURL& url, |
| const content::Referrer& referrer, |
| SessionStorageNamespace* session_storage_namespace, |
| - const gfx::Size& size) { |
| - return AddPrerender( |
| - ORIGIN_EXTERNAL_REQUEST, url, referrer, size, session_storage_namespace); |
| + const gfx::Rect& bounds) { |
| + return AddPrerender(ORIGIN_EXTERNAL_REQUEST, url, referrer, |
| + bounds, session_storage_namespace); |
| } |
| std::unique_ptr<PrerenderHandle> |
| @@ -264,11 +264,11 @@ PrerenderManager::AddPrerenderOnCellularFromExternalRequest( |
| const GURL& url, |
| const content::Referrer& referrer, |
| SessionStorageNamespace* session_storage_namespace, |
| - const gfx::Size& size) { |
| + const gfx::Rect& bounds) { |
| return AddPrerender(ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR, |
| url, |
| referrer, |
| - size, |
| + bounds, |
| session_storage_namespace); |
| } |
| @@ -276,7 +276,7 @@ std::unique_ptr<PrerenderHandle> PrerenderManager::AddPrerenderForInstant( |
| const GURL& url, |
| content::SessionStorageNamespace* session_storage_namespace, |
| const gfx::Size& size) { |
| - return AddPrerender(ORIGIN_INSTANT, url, content::Referrer(), size, |
| + return AddPrerender(ORIGIN_INSTANT, url, content::Referrer(), gfx::Rect(size), |
| session_storage_namespace); |
| } |
| @@ -284,7 +284,7 @@ std::unique_ptr<PrerenderHandle> PrerenderManager::AddPrerenderForOffline( |
| const GURL& url, |
| content::SessionStorageNamespace* session_storage_namespace, |
| const gfx::Size& size) { |
| - return AddPrerender(ORIGIN_OFFLINE, url, content::Referrer(), size, |
| + return AddPrerender(ORIGIN_OFFLINE, url, content::Referrer(), gfx::Rect(size), |
| session_storage_namespace); |
| } |
| @@ -853,7 +853,7 @@ std::unique_ptr<PrerenderHandle> PrerenderManager::AddPrerender( |
| Origin origin, |
| const GURL& url_arg, |
| const content::Referrer& referrer, |
| - const gfx::Size& size, |
| + const gfx::Rect& bounds, |
| SessionStorageNamespace* session_storage_namespace) { |
| DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| @@ -954,10 +954,10 @@ std::unique_ptr<PrerenderHandle> PrerenderManager::AddPrerender( |
| last_prerender_start_time_ = GetCurrentTimeTicks(); |
| - gfx::Size contents_size = |
| - size.IsEmpty() ? config_.default_tab_bounds.size() : size; |
| + gfx::Rect contents_bounds = |
| + bounds.IsEmpty() ? config_.default_tab_bounds : bounds; |
| - prerender_contents_ptr->StartPrerendering(contents_size, |
| + prerender_contents_ptr->StartPrerendering(contents_bounds, |
| session_storage_namespace); |
| DCHECK(IsControlGroup() || |