| 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> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "content/public/browser/android/compositor_client.h" | 14 #include "content/public/browser/android/compositor_client.h" |
| 15 #include "ui/gfx/native_widget_types.h" | 15 #include "ui/gfx/native_widget_types.h" |
| 16 | 16 |
| 17 namespace cc { | |
| 18 class Layer; | |
| 19 } | |
| 20 | |
| 21 namespace content { | 17 namespace content { |
| 22 class Compositor; | 18 class Compositor; |
| 23 | 19 |
| 24 class ContentViewRenderView : public CompositorClient { | 20 class ContentViewRenderView : public CompositorClient { |
| 25 public: | 21 public: |
| 26 // Registers the JNI methods for ContentViewRender. | 22 // Registers the JNI methods for ContentViewRender. |
| 27 static bool RegisterContentViewRenderView(JNIEnv* env); | 23 static bool RegisterContentViewRenderView(JNIEnv* env); |
| 28 | 24 |
| 29 ContentViewRenderView(JNIEnv* env, | 25 ContentViewRenderView(JNIEnv* env, |
| 30 jobject obj, | 26 jobject obj, |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 int current_surface_format_; | 63 int current_surface_format_; |
| 68 | 64 |
| 69 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 65 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 70 }; | 66 }; |
| 71 | 67 |
| 72 | 68 |
| 73 | 69 |
| 74 } | 70 } |
| 75 | 71 |
| 76 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 72 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |