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

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

Issue 865413002: Remove unnecessary LayerTreeBuildHelper from ContentViewRenderView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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"
(...skipping 16 matching lines...) Expand all
27 static bool RegisterContentViewRenderView(JNIEnv* env); 27 static bool RegisterContentViewRenderView(JNIEnv* env);
28 28
29 ContentViewRenderView(JNIEnv* env, 29 ContentViewRenderView(JNIEnv* env,
30 jobject obj, 30 jobject obj,
31 gfx::NativeWindow root_window); 31 gfx::NativeWindow root_window);
32 32
33 // Methods called from Java via JNI ----------------------------------------- 33 // Methods called from Java via JNI -----------------------------------------
34 void Destroy(JNIEnv* env, jobject obj); 34 void Destroy(JNIEnv* env, jobject obj);
35 void SetCurrentContentViewCore(JNIEnv* env, jobject obj, 35 void SetCurrentContentViewCore(JNIEnv* env, jobject obj,
36 jlong native_content_view_core); 36 jlong native_content_view_core);
37 void SetLayerTreeBuildHelper(
38 JNIEnv* env, jobject obj, jlong native_build_helper);
39 void SurfaceCreated(JNIEnv* env, jobject obj); 37 void SurfaceCreated(JNIEnv* env, jobject obj);
40 void SurfaceDestroyed(JNIEnv* env, jobject obj); 38 void SurfaceDestroyed(JNIEnv* env, jobject obj);
41 void SurfaceChanged(JNIEnv* env, jobject obj, 39 void SurfaceChanged(JNIEnv* env, jobject obj,
42 jint format, jint width, jint height, jobject surface); 40 jint format, jint width, jint height, jobject surface);
43 jboolean Composite(JNIEnv* env, jobject obj); 41 jboolean Composite(JNIEnv* env, jobject obj);
44 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); 42 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled);
45 void SetNeedsComposite(JNIEnv* env, jobject obj); 43 void SetNeedsComposite(JNIEnv* env, jobject obj);
46 44
47 // TODO(yusufo): Remove this once the compositor code is 45 // TODO(yusufo): Remove this once the compositor code is
48 // refactored to use a unified system. 46 // refactored to use a unified system.
49 jlong GetUIResourceProvider(JNIEnv* env, jobject obj); 47 jlong GetUIResourceProvider(JNIEnv* env, jobject obj);
50 48
51 // CompositorClient implementation 49 // CompositorClient implementation
52 virtual void Layout() override; 50 virtual void Layout() override;
53 virtual void OnSwapBuffersCompleted(int pending_swap_buffers) override; 51 virtual void OnSwapBuffersCompleted(int pending_swap_buffers) override;
54 52
55 private: 53 private:
56 virtual ~ContentViewRenderView(); 54 virtual ~ContentViewRenderView();
57 55
58 void InitCompositor(); 56 void InitCompositor();
59 57
60 base::android::ScopedJavaGlobalRef<jobject> java_obj_; 58 base::android::ScopedJavaGlobalRef<jobject> java_obj_;
61 scoped_ptr<LayerTreeBuildHelper> layer_tree_build_helper_;
62 59
63 scoped_ptr<content::Compositor> compositor_; 60 scoped_ptr<content::Compositor> compositor_;
64 61
65 gfx::NativeWindow root_window_; 62 gfx::NativeWindow root_window_;
66 int current_surface_format_; 63 int current_surface_format_;
67 64
68 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); 65 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);
69 }; 66 };
70 67
71 68
72 69
73 } 70 }
74 71
75 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ 72 #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