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

Side by Side Diff: chrome/browser/android/compositor/compositor_view.h

Issue 1997453003: Fix "unused variable" warnings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move changes in and out to fix compile Created 4 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CHROME_BROWSER_ANDROID_COMPOSITOR_COMPOSITOR_VIEW_H_ 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_COMPOSITOR_VIEW_H_
6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_COMPOSITOR_VIEW_H_ 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_COMPOSITOR_VIEW_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 class LayerTitleCache; 50 class LayerTitleCache;
51 class SceneLayer; 51 class SceneLayer;
52 class TabContentManager; 52 class TabContentManager;
53 class ToolbarLayer; 53 class ToolbarLayer;
54 54
55 class CompositorView : public content::CompositorClient, 55 class CompositorView : public content::CompositorClient,
56 public content::BrowserChildProcessObserver { 56 public content::BrowserChildProcessObserver {
57 public: 57 public:
58 CompositorView(JNIEnv* env, 58 CompositorView(JNIEnv* env,
59 jobject obj, 59 jobject obj,
60 jint empty_background_color,
61 jboolean low_mem_device, 60 jboolean low_mem_device,
62 ui::WindowAndroid* window_android, 61 ui::WindowAndroid* window_android,
63 LayerTitleCache* layer_title_cache,
64 TabContentManager* tab_content_manager); 62 TabContentManager* tab_content_manager);
65 63
66 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& object); 64 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& object);
67 65
68 ui::ResourceManager* GetResourceManager(); 66 ui::ResourceManager* GetResourceManager();
69 base::android::ScopedJavaLocalRef<jobject> GetResourceManager( 67 base::android::ScopedJavaLocalRef<jobject> GetResourceManager(
70 JNIEnv* env, 68 JNIEnv* env,
71 const base::android::JavaParamRef<jobject>& jobj); 69 const base::android::JavaParamRef<jobject>& jobj);
72 void SetNeedsComposite(JNIEnv* env, 70 void SetNeedsComposite(JNIEnv* env,
73 const base::android::JavaParamRef<jobject>& object); 71 const base::android::JavaParamRef<jobject>& object);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // content::BrowserChildProcessObserver implementation: 109 // content::BrowserChildProcessObserver implementation:
112 void BrowserChildProcessHostDisconnected( 110 void BrowserChildProcessHostDisconnected(
113 const content::ChildProcessData& data) override; 111 const content::ChildProcessData& data) override;
114 void BrowserChildProcessCrashed(const content::ChildProcessData& data, 112 void BrowserChildProcessCrashed(const content::ChildProcessData& data,
115 int exit_code) override; 113 int exit_code) override;
116 114
117 void SetBackground(bool visible, SkColor color); 115 void SetBackground(bool visible, SkColor color);
118 116
119 base::android::ScopedJavaGlobalRef<jobject> obj_; 117 base::android::ScopedJavaGlobalRef<jobject> obj_;
120 std::unique_ptr<content::Compositor> compositor_; 118 std::unique_ptr<content::Compositor> compositor_;
121 LayerTitleCache* layer_title_cache_;
122 TabContentManager* tab_content_manager_; 119 TabContentManager* tab_content_manager_;
123 120
124 scoped_refptr<cc::SolidColorLayer> root_layer_; 121 scoped_refptr<cc::SolidColorLayer> root_layer_;
125 SceneLayer* scene_layer_; 122 SceneLayer* scene_layer_;
126 scoped_refptr<cc::Layer> scene_layer_layer_; 123 scoped_refptr<cc::Layer> scene_layer_layer_;
127 124
128 int current_surface_format_; 125 int current_surface_format_;
129 int content_width_; 126 int content_width_;
130 int content_height_; 127 int content_height_;
131 bool overlay_video_mode_; 128 bool overlay_video_mode_;
132 SkColor empty_background_color_;
133 129
134 base::WeakPtrFactory<CompositorView> weak_factory_; 130 base::WeakPtrFactory<CompositorView> weak_factory_;
135 131
136 DISALLOW_COPY_AND_ASSIGN(CompositorView); 132 DISALLOW_COPY_AND_ASSIGN(CompositorView);
137 }; 133 };
138 134
139 bool RegisterCompositorView(JNIEnv* env); 135 bool RegisterCompositorView(JNIEnv* env);
140 136
141 } // namespace android 137 } // namespace android
142 } // namespace chrome 138 } // namespace chrome
143 139
144 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_COMPOSITOR_VIEW_H_ 140 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_COMPOSITOR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698