| Index: cc/trees/single_thread_proxy.cc
|
| diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
|
| index dcd4cf679b74500ee3ad7fa901d675f6700de710..4031509a8ffdd7b527c44a5260336e5dcdc2e0e1 100644
|
| --- a/cc/trees/single_thread_proxy.cc
|
| +++ b/cc/trees/single_thread_proxy.cc
|
| @@ -147,11 +147,7 @@ void SingleThreadProxy::CreateAndInitializeOutputSurface() {
|
| DCHECK(output_surface);
|
| initialized = layer_tree_host_impl_->InitializeRenderer(
|
| output_surface.Pass());
|
| - if (initialized) {
|
| - renderer_capabilities_for_main_thread_ =
|
| - layer_tree_host_impl_->GetRendererCapabilities()
|
| - .MainThreadCapabilities();
|
| - } else if (offscreen_context_provider.get()) {
|
| + if (!initialized && offscreen_context_provider.get()) {
|
| offscreen_context_provider->VerifyContexts();
|
| offscreen_context_provider = NULL;
|
| }
|
| @@ -370,6 +366,12 @@ void SingleThreadProxy::SendManagedMemoryStats() {
|
|
|
| bool SingleThreadProxy::IsInsideDraw() { return inside_draw_; }
|
|
|
| +void SingleThreadProxy::UpdateRendererCapabilitiesOnImplThread() {
|
| + DCHECK(IsImplThread());
|
| + renderer_capabilities_for_main_thread_ =
|
| + layer_tree_host_impl_->GetRendererCapabilities().MainThreadCapabilities();
|
| +}
|
| +
|
| void SingleThreadProxy::DidLoseOutputSurfaceOnImplThread() {
|
| TRACE_EVENT0("cc", "SingleThreadProxy::DidLoseOutputSurfaceOnImplThread");
|
| // Cause a commit so we can notice the lost context.
|
|
|