Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Side by Side Diff: content/browser/android/content_view_render_view.h

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 ui {
18 class ViewRoot;
19 }
20
17 namespace content { 21 namespace content {
18 class Compositor; 22 class Compositor;
19 23
20 class ContentViewRenderView : public CompositorClient { 24 class ContentViewRenderView : public CompositorClient {
21 public: 25 public:
22 // Registers the JNI methods for ContentViewRender. 26 // Registers the JNI methods for ContentViewRender.
23 static bool RegisterContentViewRenderView(JNIEnv* env); 27 static bool RegisterContentViewRenderView(JNIEnv* env);
24 28
25 ContentViewRenderView(JNIEnv* env, 29 ContentViewRenderView(JNIEnv* env, jobject obj, ui::ViewRoot* view_root);
26 jobject obj,
27 gfx::NativeWindow root_window);
28 30
29 // Methods called from Java via JNI ----------------------------------------- 31 // Methods called from Java via JNI -----------------------------------------
30 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 32 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
31 void SetCurrentWebContents( 33 void SetCurrentWebContents(
32 JNIEnv* env, 34 JNIEnv* env,
33 const base::android::JavaParamRef<jobject>& obj, 35 const base::android::JavaParamRef<jobject>& obj,
34 const base::android::JavaParamRef<jobject>& jweb_contents); 36 const base::android::JavaParamRef<jobject>& jweb_contents);
35 void SurfaceCreated(JNIEnv* env, 37 void SurfaceCreated(JNIEnv* env,
36 const base::android::JavaParamRef<jobject>& obj); 38 const base::android::JavaParamRef<jobject>& obj);
37 void SurfaceDestroyed(JNIEnv* env, 39 void SurfaceDestroyed(JNIEnv* env,
(...skipping 14 matching lines...) Expand all
52 54
53 private: 55 private:
54 ~ContentViewRenderView() override; 56 ~ContentViewRenderView() override;
55 57
56 void InitCompositor(); 58 void InitCompositor();
57 59
58 base::android::ScopedJavaGlobalRef<jobject> java_obj_; 60 base::android::ScopedJavaGlobalRef<jobject> java_obj_;
59 61
60 std::unique_ptr<content::Compositor> compositor_; 62 std::unique_ptr<content::Compositor> compositor_;
61 63
62 gfx::NativeWindow root_window_; 64 ui::ViewRoot* view_root_;
63 int current_surface_format_; 65 int current_surface_format_;
64 66
65 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); 67 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);
66 }; 68 };
67 69
68 70
69 71
70 } 72 }
71 73
72 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ 74 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698