| Index: cc/output/software_renderer.cc
|
| diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
|
| index ddc5e4c1a1a09fa5560ae438361c888737016c51..0662b8a4f618b7a1d9b11f1261492ddc831ab892 100644
|
| --- a/cc/output/software_renderer.cc
|
| +++ b/cc/output/software_renderer.cc
|
| @@ -52,7 +52,7 @@ bool IsScaleAndIntegerTranslate(const SkMatrix& matrix) {
|
| } // anonymous namespace
|
|
|
| std::unique_ptr<SoftwareRenderer> SoftwareRenderer::Create(
|
| - RendererClient* client,
|
| + DirectRendererClient* client,
|
| const RendererSettings* settings,
|
| OutputSurface* output_surface,
|
| ResourceProvider* resource_provider) {
|
| @@ -60,13 +60,12 @@ std::unique_ptr<SoftwareRenderer> SoftwareRenderer::Create(
|
| resource_provider));
|
| }
|
|
|
| -SoftwareRenderer::SoftwareRenderer(RendererClient* client,
|
| +SoftwareRenderer::SoftwareRenderer(DirectRendererClient* client,
|
| const RendererSettings* settings,
|
| OutputSurface* output_surface,
|
| ResourceProvider* resource_provider)
|
| : DirectRenderer(client, settings, output_surface, resource_provider),
|
| is_scissor_enabled_(false),
|
| - is_backbuffer_discarded_(false),
|
| output_device_(output_surface->software_device()),
|
| current_canvas_(nullptr) {
|
| if (resource_provider_) {
|
| @@ -132,8 +131,6 @@ void SoftwareRenderer::EnsureScissorTestDisabled() {
|
| SetClipRect(gfx::Rect(size.width(), size.height()));
|
| }
|
|
|
| -void SoftwareRenderer::Finish() {}
|
| -
|
| void SoftwareRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) {
|
| DCHECK(!output_surface_->HasExternalStencilTest());
|
| current_framebuffer_lock_ = nullptr;
|
| @@ -608,33 +605,6 @@ void SoftwareRenderer::CopyCurrentRenderPassToBitmap(
|
| request->SendBitmapResult(std::move(bitmap));
|
| }
|
|
|
| -void SoftwareRenderer::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 SoftwareRenderer::EnsureBackbuffer() {
|
| - if (!is_backbuffer_discarded_)
|
| - return;
|
| -
|
| - output_surface_->EnsureBackbuffer();
|
| - is_backbuffer_discarded_ = false;
|
| -}
|
| -
|
| -void SoftwareRenderer::DidChangeVisibility() {
|
| - if (visible())
|
| - EnsureBackbuffer();
|
| - else
|
| - DiscardBackbuffer();
|
| -}
|
| -
|
| bool SoftwareRenderer::ShouldApplyBackgroundFilters(
|
| const RenderPassDrawQuad* quad) const {
|
| if (quad->background_filters.IsEmpty())
|
|
|