diff options
| author | kristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 12:58:49 +0000 |
|---|---|---|
| committer | kristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 12:58:49 +0000 |
| commit | fd241a2ae67f9e0a1b95af0c170712512decde24 (patch) | |
| tree | d13fb5838c1669d4c2ae461c2e8e826b439ae051 /android_webview | |
| parent | d47f73aa4e09c1f9720485f2ee0da2b028421ba1 (diff) | |
| download | chromium_src-fd241a2ae67f9e0a1b95af0c170712512decde24.zip chromium_src-fd241a2ae67f9e0a1b95af0c170712512decde24.tar.gz chromium_src-fd241a2ae67f9e0a1b95af0c170712512decde24.tar.bz2 | |
Fix bug in cl 14668007
Update to https://codereview.chromium.org/14668007
BUG=
Review URL: https://chromiumcodereview.appspot.com/14672013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/browser_view_renderer_impl.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/android_webview/browser/browser_view_renderer_impl.cc b/android_webview/browser/browser_view_renderer_impl.cc index 4d7e30f..b21541b 100644 --- a/android_webview/browser/browser_view_renderer_impl.cc +++ b/android_webview/browser/browser_view_renderer_impl.cc @@ -466,6 +466,12 @@ void BrowserViewRendererImpl::ScheduleComposite() { } skia::RefPtr<SkPicture> BrowserViewRendererImpl::GetLastCapturedPicture() { + // Use the latest available picture if the listener callback is enabled. + skia::RefPtr<SkPicture> picture = + RendererPictureMap::GetInstance()->GetRendererPicture( + web_contents_->GetRoutingID()); + if (picture) return picture; + // Get it synchronously. view_renderer_host_->CapturePictureSync(); return RendererPictureMap::GetInstance()->GetRendererPicture( @@ -474,6 +480,10 @@ skia::RefPtr<SkPicture> BrowserViewRendererImpl::GetLastCapturedPicture() { void BrowserViewRendererImpl::OnPictureUpdated(int process_id, int render_view_id) { + CHECK_EQ(web_contents_->GetRenderProcessHost()->GetID(), process_id); + if (render_view_id != web_contents_->GetRoutingID()) + return; + client_->OnNewPicture(); // TODO(mkosiba): Remove when invalidation path is re-implemented. |