| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <memory> |
| 5 #include <vector> | 6 #include <vector> |
| 6 | 7 |
| 7 #include "base/macros.h" | 8 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | |
| 9 | 9 |
| 10 namespace gfx { | 10 namespace gfx { |
| 11 class GLContext; | 11 class GLContext; |
| 12 } | 12 } |
| 13 | 13 |
| 14 namespace android_webview { | 14 namespace android_webview { |
| 15 | 15 |
| 16 namespace internal { | 16 namespace internal { |
| 17 class ScopedAppGLStateRestoreImpl; | 17 class ScopedAppGLStateRestoreImpl; |
| 18 } | 18 } |
| (...skipping 25 matching lines...) Expand all Loading... |
| 44 MODE_RESOURCE_MANAGEMENT, | 44 MODE_RESOURCE_MANAGEMENT, |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 explicit ScopedAppGLStateRestore(CallMode mode); | 47 explicit ScopedAppGLStateRestore(CallMode mode); |
| 48 ~ScopedAppGLStateRestore(); | 48 ~ScopedAppGLStateRestore(); |
| 49 | 49 |
| 50 StencilState stencil_state() const; | 50 StencilState stencil_state() const; |
| 51 int framebuffer_binding_ext() const; | 51 int framebuffer_binding_ext() const; |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 scoped_ptr<internal::ScopedAppGLStateRestoreImpl> impl_; | 54 std::unique_ptr<internal::ScopedAppGLStateRestoreImpl> impl_; |
| 55 | 55 |
| 56 DISALLOW_COPY_AND_ASSIGN(ScopedAppGLStateRestore); | 56 DISALLOW_COPY_AND_ASSIGN(ScopedAppGLStateRestore); |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namespace android_webview | 59 } // namespace android_webview |
| OLD | NEW |