Chromium Code Reviews| Index: content/browser/frame_host/navigator_impl.cc |
| diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc |
| index a9836089cc21893d628cd9861c2d7f10aea22410..7be5f8c967940cc8bd780e2ab9f9313599f045c9 100644 |
| --- a/content/browser/frame_host/navigator_impl.cc |
| +++ b/content/browser/frame_host/navigator_impl.cc |
| @@ -396,14 +396,19 @@ void NavigatorImpl::DidNavigate( |
| } |
| if (PageTransitionIsMainFrame(params.transition)) { |
| - // When overscroll navigation gesture is enabled, a screenshot of the page |
| - // in its current state is taken so that it can be used during the |
| - // nav-gesture. It is necessary to take the screenshot here, before calling |
| - // RenderFrameHostManager::DidNavigateMainFrame, because that can change |
| - // WebContents::GetRenderViewHost to return the new host, instead of the one |
| - // that may have just been swapped out. |
| - if (delegate_ && delegate_->CanOverscrollContent()) |
| - controller_->TakeScreenshot(); |
| + if (delegate_) { |
| + // When overscroll navigation gesture is enabled, a screenshot of the page |
| + // in its current state is taken so that it can be used during the |
| + // nav-gesture. It is necessary to take the screenshot here, before |
| + // calling RenderFrameHostManager::DidNavigateMainFrame, because that can |
| + // change WebContents::GetRenderViewHost to return the new host, instead |
| + // of the one that may have just been swapped out. |
| + if (delegate_->CanOverscrollContent()) |
| + controller_->TakeScreenshot(); |
|
Charlie Reis
2014/04/01 23:12:38
I agree that we shouldn't do it here, but I may mo
miu
2014/04/01 23:39:35
Yeah, I almost did that. ;-) Feel free to use me
|
| + |
| + // Run tasks that must execute just before the commit. |
| + delegate_->DidNavigateMainFramePreCommit(params); |
| + } |
| if (!use_site_per_process) |
| frame_tree->root()->render_manager()->DidNavigateFrame(render_frame_host); |