Index: cc/trees/remote_channel_impl.cc |
diff --git a/cc/trees/remote_channel_impl.cc b/cc/trees/remote_channel_impl.cc |
index f981df9dfd9bf162cd0ede80e10dab8f6bf83a43..3f8754c1c17c479c7fbf05691681b13f5ee742ce 100644 |
--- a/cc/trees/remote_channel_impl.cc |
+++ b/cc/trees/remote_channel_impl.cc |
@@ -193,6 +193,11 @@ |
base::Bind(&ProxyImpl::SetVisibleOnImpl, proxy_impl_weak_ptr_, visible)); |
} |
+const RendererCapabilities& RemoteChannelImpl::GetRendererCapabilities() const { |
+ NOTREACHED() << "Should not be called on the remote client LayerTreeHost"; |
+ return main().renderer_capabilities; |
+} |
+ |
void RemoteChannelImpl::SetNeedsAnimate() { |
NOTREACHED() << "Should not be called on the remote client LayerTreeHost"; |
} |
@@ -319,6 +324,9 @@ |
impl().remote_channel_weak_ptr)); |
} |
+void RemoteChannelImpl::SetRendererCapabilitiesMainCopy( |
+ const RendererCapabilities& capabilities) {} |
+ |
void RemoteChannelImpl::BeginMainFrameNotExpectedSoon() {} |
void RemoteChannelImpl::DidCommitAndDrawFrame() { |
@@ -347,13 +355,15 @@ |
impl().remote_channel_weak_ptr)); |
} |
-void RemoteChannelImpl::DidInitializeOutputSurface(bool success) { |
+void RemoteChannelImpl::DidInitializeOutputSurface( |
+ bool success, |
+ const RendererCapabilities& capabilities) { |
DCHECK(task_runner_provider_->IsImplThread()); |
MainThreadTaskRunner()->PostTask( |
FROM_HERE, |
base::Bind(&RemoteChannelImpl::DidInitializeOutputSurfaceOnMain, |
- impl().remote_channel_weak_ptr, success)); |
+ impl().remote_channel_weak_ptr, success, capabilities)); |
} |
void RemoteChannelImpl::DidCompletePageScaleAnimation() {} |
@@ -406,7 +416,9 @@ |
main().layer_tree_host->RequestNewOutputSurface(); |
} |
-void RemoteChannelImpl::DidInitializeOutputSurfaceOnMain(bool success) { |
+void RemoteChannelImpl::DidInitializeOutputSurfaceOnMain( |
+ bool success, |
+ const RendererCapabilities& capabilities) { |
DCHECK(task_runner_provider_->IsMainThread()); |
if (!success) { |
@@ -415,6 +427,7 @@ |
} |
VLOG(1) << "OutputSurface initialized successfully"; |
+ main().renderer_capabilities = capabilities; |
main().layer_tree_host->DidInitializeOutputSurface(); |
// If we were waiting for output surface initialization, we might have queued |