Chromium Code Reviews| Index: cc/output/gl_renderer.cc |
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc |
| index e3f13f24c1f5ddd29b122fd095db675a5466aeeb..64df6dca70074b3fa0943b01204f5f0d9d350d17 100644 |
| --- a/cc/output/gl_renderer.cc |
| +++ b/cc/output/gl_renderer.cc |
| @@ -302,7 +302,7 @@ class GLRenderer::SyncQuery { |
| }; |
| std::unique_ptr<GLRenderer> GLRenderer::Create( |
| - RendererClient* client, |
| + DirectRendererClient* client, |
| const RendererSettings* settings, |
| OutputSurface* output_surface, |
| ResourceProvider* resource_provider, |
| @@ -313,7 +313,7 @@ std::unique_ptr<GLRenderer> GLRenderer::Create( |
| texture_mailbox_deleter, highp_threshold_min)); |
| } |
| -GLRenderer::GLRenderer(RendererClient* client, |
| +GLRenderer::GLRenderer(DirectRendererClient* client, |
| const RendererSettings* settings, |
| OutputSurface* output_surface, |
| ResourceProvider* resource_provider, |
| @@ -325,7 +325,6 @@ GLRenderer::GLRenderer(RendererClient* client, |
| gl_(output_surface->context_provider()->ContextGL()), |
| context_support_(output_surface->context_provider()->ContextSupport()), |
| texture_mailbox_deleter_(texture_mailbox_deleter), |
| - is_backbuffer_discarded_(false), |
| is_scissor_enabled_(false), |
| scissor_rect_needs_reset_(true), |
| stencil_shadow_(false), |
| @@ -391,13 +390,6 @@ const RendererCapabilitiesImpl& GLRenderer::Capabilities() const { |
| return capabilities_; |
| } |
| -void GLRenderer::DidChangeVisibility() { |
| - EnforceMemoryPolicy(); |
| - |
| - // If we are not visible, we ask the context to aggressively free resources. |
| - context_support_->SetAggressivelyFreeResources(!visible()); |
| -} |
| - |
| void GLRenderer::ReleaseRenderPassTextures() { render_pass_textures_.clear(); } |
| void GLRenderer::DiscardPixels() { |
| @@ -2714,14 +2706,7 @@ void GLRenderer::DrawQuadGeometry(const DrawingFrame* frame, |
| gl_->DrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0); |
| } |
| -void GLRenderer::Finish() { |
| - TRACE_EVENT0("cc", "GLRenderer::Finish"); |
| - gl_->Finish(); |
| -} |
| - |
| void GLRenderer::SwapBuffers(CompositorFrameMetadata metadata) { |
| - DCHECK(!is_backbuffer_discarded_); |
| - |
| TRACE_EVENT0("cc,benchmark", "GLRenderer::SwapBuffers"); |
| // We're done! Time to swapbuffers! |
| @@ -2810,37 +2795,6 @@ void GLRenderer::DidReceiveTextureInUseResponses( |
| } |
| } |
| -void GLRenderer::EnforceMemoryPolicy() { |
| - if (!visible()) { |
| - TRACE_EVENT0("cc", "GLRenderer::EnforceMemoryPolicy dropping resources"); |
| - ReleaseRenderPassTextures(); |
| - DiscardBackbuffer(); |
| - output_surface_->context_provider()->DeleteCachedResources(); |
| - gl_->Flush(); |
| - } |
| - PrepareGeometry(NO_BINDING); |
| -} |
| - |
| -void GLRenderer::DiscardBackbuffer() { |
| - if (is_backbuffer_discarded_) |
| - return; |
| - |
| - output_surface_->DiscardBackbuffer(); |
| - |
| - is_backbuffer_discarded_ = true; |
| - |
| - // Damage tracker needs a full reset every time framebuffer is discarded. |
| - client_->SetFullRootLayerDamage(); |
| -} |
| - |
| -void GLRenderer::EnsureBackbuffer() { |
| - if (!is_backbuffer_discarded_) |
| - return; |
| - |
| - output_surface_->EnsureBackbuffer(); |
| - is_backbuffer_discarded_ = false; |
| -} |
| - |
| void GLRenderer::GetFramebufferPixelsAsync( |
| const DrawingFrame* frame, |
| const gfx::Rect& rect, |
| @@ -2950,7 +2904,8 @@ void GLRenderer::GetFramebufferPixelsAsync( |
| gl_->EndQueryEXT(GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM); |
| context_support_->SignalQuery(query, cancelable_callback); |
| - EnforceMemoryPolicy(); |
| + // WHY??? |
|
enne (OOO)
2016/08/08 21:41:18
This doesn't seem needed to me, but feel free to r
|
| + PrepareGeometry(NO_BINDING); |
| } |
| void GLRenderer::FinishedReadback(unsigned source_buffer, |