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

Unified Diff: content/browser/renderer_host/compositor_impl_android.cc

Issue 2468633002: Replaced cc::Display::SetSurfaceId() with SetLocalFrameId() (Closed)
Patch Set: rebase and minor bug fixes Created 4 years, 1 month 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
Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 37ca4985296a2ed3973c79357f773314689760ad..fcbcb21aeee87b0b026248d8ff572b662a677aca 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -726,8 +726,9 @@ void CompositorImpl::InitializeDisplay(
display_.reset(new cc::Display(
HostSharedBitmapManager::current(),
BrowserGpuMemoryBufferManager::current(),
- host_->GetSettings().renderer_settings, std::move(begin_frame_source),
- std::move(display_output_surface), std::move(scheduler),
+ host_->GetSettings().renderer_settings, frame_sink_id_,
+ std::move(begin_frame_source), std::move(display_output_surface),
+ std::move(scheduler),
base::MakeUnique<cc::TextureMailboxDeleter>(task_runner)));
auto compositor_frame_sink =

Powered by Google App Engine
This is Rietveld 408576698