| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
| 9 #include "base/logging.h" | 11 #include "base/logging.h" |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 13 #include "content/public/browser/android/compositor_client.h" | 14 #include "content/public/browser/android/compositor_client.h" |
| 14 #include "ui/gfx/native_widget_types.h" | 15 #include "ui/gfx/native_widget_types.h" |
| 15 | 16 |
| 16 namespace cc { | 17 namespace cc { |
| 17 class Layer; | 18 class Layer; |
| 18 } | 19 } |
| 19 | 20 |
| 20 namespace content { | 21 namespace content { |
| 21 class Compositor; | 22 class Compositor; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 void UpdateLayerTreeHost() override; | 54 void UpdateLayerTreeHost() override; |
| 54 void OnSwapBuffersCompleted(int pending_swap_buffers) override; | 55 void OnSwapBuffersCompleted(int pending_swap_buffers) override; |
| 55 | 56 |
| 56 private: | 57 private: |
| 57 ~ContentViewRenderView() override; | 58 ~ContentViewRenderView() override; |
| 58 | 59 |
| 59 void InitCompositor(); | 60 void InitCompositor(); |
| 60 | 61 |
| 61 base::android::ScopedJavaGlobalRef<jobject> java_obj_; | 62 base::android::ScopedJavaGlobalRef<jobject> java_obj_; |
| 62 | 63 |
| 63 scoped_ptr<content::Compositor> compositor_; | 64 std::unique_ptr<content::Compositor> compositor_; |
| 64 | 65 |
| 65 gfx::NativeWindow root_window_; | 66 gfx::NativeWindow root_window_; |
| 66 int current_surface_format_; | 67 int current_surface_format_; |
| 67 | 68 |
| 68 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 69 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 69 }; | 70 }; |
| 70 | 71 |
| 71 | 72 |
| 72 | 73 |
| 73 } | 74 } |
| 74 | 75 |
| 75 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 76 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |