| Index: cc/output/output_surface.h
|
| diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
|
| index d6f4b82ed8b64d9a9d81a87d52a5b0552746c852..c7910db77c6cc09a966de9b68163645e36f26fd7 100644
|
| --- a/cc/output/output_surface.h
|
| +++ b/cc/output/output_surface.h
|
| @@ -105,14 +105,16 @@ class CC_EXPORT OutputSurface {
|
| virtual void SetNeedsBeginFrame(bool enable) {}
|
|
|
| protected:
|
| + bool InitializeAndSetContext3D(
|
| + scoped_ptr<WebKit::WebGraphicsContext3D> context3d);
|
| +
|
| OutputSurfaceClient* client_;
|
| struct cc::OutputSurface::Capabilities capabilities_;
|
| + scoped_ptr<OutputSurfaceCallbacks> callbacks_;
|
| scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
|
| scoped_ptr<cc::SoftwareOutputDevice> software_device_;
|
| bool has_gl_discard_backbuffer_;
|
|
|
| - scoped_ptr<OutputSurfaceCallbacks> callbacks_;
|
| -
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(OutputSurface);
|
| };
|
|
|