| Index: cc/output/output_surface.h
|
| diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
|
| index 98a48304b8b1fa0c85c700cd7c4a5d38d4de335e..9c5ce6f81bbeb46fa8b80bee971325358ecee017 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
|
| @@ -175,6 +170,7 @@ class CC_EXPORT OutputSurface {
|
| void SetExternalDrawConstraints(const gfx::Transform& transform,
|
| const gfx::Rect& viewport,
|
| const gfx::Rect& clip,
|
| + bool resourceless_software_draw,
|
| bool valid_for_tile_management);
|
|
|
| private:
|
|
|