From 0e0b7fd925f358c38d94330aeb66434ae159a6b8 Mon Sep 17 00:00:00 2001 From: "dneto@chromium.org" Date: Fri, 8 Aug 2014 22:53:11 +0000 Subject: LayerTreeHostImpl knows if it has an output surface. Surface loss is only detected via the callback. We can tolerate multiple calls to InitializeRenderer without needing the lost-surface callback in between. Remove Renderer::IsContextLost, but keep GLRenderer::IsContextLost. Remove ThreadProxy::CheckOutputSurfaceStatusOnImplThread BUG=392891 Review URL: https://codereview.chromium.org/446973002 Cr-Commit-Position: refs/heads/master@{#288457} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288457 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/output/delegating_renderer.cc | 7 ------- cc/output/delegating_renderer.h | 2 -- cc/output/gl_renderer.h | 2 +- cc/output/renderer.cc | 4 ---- cc/output/renderer.h | 2 -- 5 files changed, 1 insertion(+), 16 deletions(-) (limited to 'cc/output') diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc index 206c05c..143596b 100644 --- a/cc/output/delegating_renderer.cc +++ b/cc/output/delegating_renderer.cc @@ -112,13 +112,6 @@ void DelegatingRenderer::ReceiveSwapBuffersAck( resource_provider_->ReceiveReturnsFromParent(ack.resources); } -bool DelegatingRenderer::IsContextLost() { - ContextProvider* context_provider = output_surface_->context_provider(); - if (!context_provider) - return false; - return context_provider->IsContextLost(); -} - void DelegatingRenderer::DidChangeVisibility() { ContextProvider* context_provider = output_surface_->context_provider(); if (!visible()) { diff --git a/cc/output/delegating_renderer.h b/cc/output/delegating_renderer.h index 10d95ce..52dbe01 100644 --- a/cc/output/delegating_renderer.h +++ b/cc/output/delegating_renderer.h @@ -37,8 +37,6 @@ class CC_EXPORT DelegatingRenderer : public Renderer { virtual void SwapBuffers(const CompositorFrameMetadata& metadata) OVERRIDE; virtual void ReceiveSwapBuffersAck(const CompositorFrameAck&) OVERRIDE; - virtual bool IsContextLost() OVERRIDE; - private: DelegatingRenderer(RendererClient* client, const LayerTreeSettings* settings, diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h index d5c4f0a..75a5d6e 100644 --- a/cc/output/gl_renderer.h +++ b/cc/output/gl_renderer.h @@ -65,7 +65,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer { virtual void DoNoOp() OVERRIDE; virtual void SwapBuffers(const CompositorFrameMetadata& metadata) OVERRIDE; - virtual bool IsContextLost() OVERRIDE; + virtual bool IsContextLost(); static void DebugGLCall(gpu::gles2::GLES2Interface* gl, const char* command, diff --git a/cc/output/renderer.cc b/cc/output/renderer.cc index dedc204..2de4630 100644 --- a/cc/output/renderer.cc +++ b/cc/output/renderer.cc @@ -10,10 +10,6 @@ bool Renderer::HasAllocatedResourcesForTesting(RenderPass::Id id) const { return false; } -bool Renderer::IsContextLost() { - return false; -} - void Renderer::SetVisible(bool visible) { if (visible_ == visible) return; diff --git a/cc/output/renderer.h b/cc/output/renderer.h index b9376c9..b6d0cd4 100644 --- a/cc/output/renderer.h +++ b/cc/output/renderer.h @@ -73,8 +73,6 @@ class CC_EXPORT Renderer { virtual void SwapBuffers(const CompositorFrameMetadata& metadata) = 0; virtual void ReceiveSwapBuffersAck(const CompositorFrameAck& ack) {} - virtual bool IsContextLost(); - bool visible() const { return visible_; } void SetVisible(bool visible); -- cgit v1.1