| Index: content/browser/renderer_host/compositing_iosurface_context_mac.h
|
| diff --git a/content/browser/renderer_host/compositing_iosurface_context_mac.h b/content/browser/renderer_host/compositing_iosurface_context_mac.h
|
| index e21839c8ded71e3fbc897b58a1fd574f675bbe21..84ffc632e7aad1a97fe37719d3dc849d35473325 100644
|
| --- a/content/browser/renderer_host/compositing_iosurface_context_mac.h
|
| +++ b/content/browser/renderer_host/compositing_iosurface_context_mac.h
|
| @@ -11,8 +11,8 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/lazy_instance.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
|
|
| namespace content {
|
| @@ -53,7 +53,7 @@ class CompositingIOSurfaceContext
|
| ~CompositingIOSurfaceContext();
|
|
|
| int window_number_;
|
| - scoped_nsobject<NSOpenGLContext> nsgl_context_;
|
| + base::scoped_nsobject<NSOpenGLContext> nsgl_context_;
|
| CGLContextObj cgl_context_; // weak, backed by |nsgl_context_|
|
| bool is_vsync_disabled_;
|
| scoped_ptr<CompositingIOSurfaceShaderPrograms> shader_program_cache_;
|
|
|