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

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

Issue 493853005: Add API to get the UIResourceProvider from ContentViewRenderView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased again Created 6 years, 3 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
« no previous file with comments | « no previous file | content/browser/android/content_view_render_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/android/jni_weak_ref.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "content/public/browser/android/compositor_client.h" 12 #include "content/public/browser/android/compositor_client.h"
13 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
14 14
15 namespace cc { 15 namespace cc {
16 class Layer; 16 class Layer;
17 } 17 }
18 18
19 namespace content { 19 namespace content {
20 class Compositor; 20 class Compositor;
21 class LayerTreeBuildHelper; 21 class LayerTreeBuildHelper;
22 class UIResourceProvider;
22 23
23 class ContentViewRenderView : public CompositorClient { 24 class ContentViewRenderView : public CompositorClient {
24 public: 25 public:
25 // Registers the JNI methods for ContentViewRender. 26 // Registers the JNI methods for ContentViewRender.
26 static bool RegisterContentViewRenderView(JNIEnv* env); 27 static bool RegisterContentViewRenderView(JNIEnv* env);
27 28
28 ContentViewRenderView(JNIEnv* env, 29 ContentViewRenderView(JNIEnv* env,
29 jobject obj, 30 jobject obj,
30 gfx::NativeWindow root_window); 31 gfx::NativeWindow root_window);
31 32
32 // Methods called from Java via JNI ----------------------------------------- 33 // Methods called from Java via JNI -----------------------------------------
33 void Destroy(JNIEnv* env, jobject obj); 34 void Destroy(JNIEnv* env, jobject obj);
34 void SetCurrentContentViewCore(JNIEnv* env, jobject obj, 35 void SetCurrentContentViewCore(JNIEnv* env, jobject obj,
35 jlong native_content_view_core); 36 jlong native_content_view_core);
36 void SetLayerTreeBuildHelper( 37 void SetLayerTreeBuildHelper(
37 JNIEnv* env, jobject obj, jlong native_build_helper); 38 JNIEnv* env, jobject obj, jlong native_build_helper);
38 void SurfaceCreated(JNIEnv* env, jobject obj); 39 void SurfaceCreated(JNIEnv* env, jobject obj);
39 void SurfaceDestroyed(JNIEnv* env, jobject obj); 40 void SurfaceDestroyed(JNIEnv* env, jobject obj);
40 void SurfaceChanged(JNIEnv* env, jobject obj, 41 void SurfaceChanged(JNIEnv* env, jobject obj,
41 jint format, jint width, jint height, jobject surface); 42 jint format, jint width, jint height, jobject surface);
42 jboolean Composite(JNIEnv* env, jobject obj); 43 jboolean Composite(JNIEnv* env, jobject obj);
43 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); 44 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled);
44 void SetNeedsComposite(JNIEnv* env, jobject obj); 45 void SetNeedsComposite(JNIEnv* env, jobject obj);
45 46
47 // TODO(yusufo): Remove this once the compositor code is
48 // refactored to use a unified system.
49 jlong GetUIResourceProvider(JNIEnv* env, jobject obj);
50
46 // CompositorClient implementation 51 // CompositorClient implementation
47 virtual void Layout() OVERRIDE; 52 virtual void Layout() OVERRIDE;
48 virtual void OnSwapBuffersCompleted(int pending_swap_buffers) OVERRIDE; 53 virtual void OnSwapBuffersCompleted(int pending_swap_buffers) OVERRIDE;
49 54
50 private: 55 private:
51 virtual ~ContentViewRenderView(); 56 virtual ~ContentViewRenderView();
52 57
53 void InitCompositor(); 58 void InitCompositor();
54 59
55 base::android::ScopedJavaGlobalRef<jobject> java_obj_; 60 base::android::ScopedJavaGlobalRef<jobject> java_obj_;
56 scoped_ptr<LayerTreeBuildHelper> layer_tree_build_helper_; 61 scoped_ptr<LayerTreeBuildHelper> layer_tree_build_helper_;
57 62
58 scoped_ptr<content::Compositor> compositor_; 63 scoped_ptr<content::Compositor> compositor_;
59 64
60 gfx::NativeWindow root_window_; 65 gfx::NativeWindow root_window_;
61 int current_surface_format_; 66 int current_surface_format_;
62 67
63 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); 68 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);
64 }; 69 };
65 70
66 71
67 72
68 } 73 }
69 74
70 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ 75 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_view_render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698