| Index: cc/output/output_surface.h
|
| diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
|
| index f3a874ac458b064486cd6335466728049738484f..eeef838ba67dd57d969ff3b0f1953954a6635a08 100644
|
| --- a/cc/output/output_surface.h
|
| +++ b/cc/output/output_surface.h
|
| @@ -46,11 +46,12 @@ class CC_EXPORT OutputSurface {
|
| DEFAULT_MAX_FRAMES_PENDING = 2
|
| };
|
|
|
| - explicit OutputSurface(scoped_refptr<ContextProvider> context_provider);
|
| + explicit OutputSurface(
|
| + const scoped_refptr<ContextProvider>& context_provider);
|
|
|
| explicit OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device);
|
|
|
| - OutputSurface(scoped_refptr<ContextProvider> context_provider,
|
| + OutputSurface(const scoped_refptr<ContextProvider>& context_provider,
|
| scoped_ptr<SoftwareOutputDevice> software_device);
|
|
|
| virtual ~OutputSurface();
|
| @@ -85,9 +86,7 @@ class CC_EXPORT OutputSurface {
|
| // surface. Either of these may return a null pointer, but not both.
|
| // In the event of a lost context, the entire output surface should be
|
| // recreated.
|
| - scoped_refptr<ContextProvider> context_provider() const {
|
| - return context_provider_.get();
|
| - }
|
| + ContextProvider* context_provider() const { return context_provider_.get(); }
|
| SoftwareOutputDevice* software_device() const {
|
| return software_device_.get();
|
| }
|
|
|