| Index: cc/output/output_surface.cc
|
| diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
|
| index 369a152ea9d2371cb90f4c42562d6305775ad40b..518ec78d26f74f1a4e094cae05197989bdd0226b 100644
|
| --- a/cc/output/output_surface.cc
|
| +++ b/cc/output/output_surface.cc
|
| @@ -91,12 +91,13 @@ void OutputSurface::SetExternalStencilTest(bool enabled) {
|
| external_stencil_test_enabled_ = enabled;
|
| }
|
|
|
| -void OutputSurface::SetExternalDrawConstraints(const gfx::Transform& transform,
|
| - const gfx::Rect& viewport,
|
| - const gfx::Rect& clip,
|
| - bool valid_for_tile_management) {
|
| +void OutputSurface::SetExternalDrawConstraints(
|
| + const gfx::Transform& transform,
|
| + const gfx::Rect& viewport,
|
| + const gfx::Rect& clip,
|
| + bool resourceless_software_draw) {
|
| client_->SetExternalDrawConstraints(
|
| - transform, viewport, clip, valid_for_tile_management);
|
| + transform, viewport, clip, resourceless_software_draw);
|
| }
|
|
|
| OutputSurface::~OutputSurface() {
|
| @@ -107,8 +108,6 @@ bool OutputSurface::HasExternalStencilTest() const {
|
| return external_stencil_test_enabled_;
|
| }
|
|
|
| -bool OutputSurface::ForcedDrawToSoftwareDevice() const { return false; }
|
| -
|
| bool OutputSurface::BindToClient(OutputSurfaceClient* client) {
|
| DCHECK(client);
|
| client_ = client;
|
|
|