| Index: cc/output/output_surface.h
|
| diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
|
| index 4ba3e5f2b225ca6dd1f681b936edbdc0e9e61af7..07c0f262f5552c362d8205ef0129ccfb4b6c9159 100644
|
| --- a/cc/output/output_surface.h
|
| +++ b/cc/output/output_surface.h
|
| @@ -94,11 +94,6 @@ class CC_EXPORT OutputSurface {
|
| return software_device_.get();
|
| }
|
|
|
| - // In the case where both the context3d and software_device are present
|
| - // (namely Android WebView), this is called to determine whether the software
|
| - // device should be used on the current frame.
|
| - virtual bool ForcedDrawToSoftwareDevice() const;
|
| -
|
| // Called by the compositor on the compositor thread. This is a place where
|
| // thread-specific data for the output surface can be initialized, since from
|
| // this point on the output surface will only be used on the compositor
|
| @@ -171,7 +166,7 @@ class CC_EXPORT OutputSurface {
|
| void SetExternalDrawConstraints(const gfx::Transform& transform,
|
| const gfx::Rect& viewport,
|
| const gfx::Rect& clip,
|
| - bool valid_for_tile_management);
|
| + bool resourceless_software_draw);
|
|
|
| private:
|
| void SetUpContext3d();
|
|
|