OLD | NEW |
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 #include "chrome/browser/android/compositor/compositor_view.h" | 5 #include "chrome/browser/android/compositor/compositor_view.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include <android/bitmap.h> | 9 #include <android/bitmap.h> |
10 #include <android/native_window_jni.h> | 10 #include <android/native_window_jni.h> |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 75 |
76 CompositorView::CompositorView(JNIEnv* env, | 76 CompositorView::CompositorView(JNIEnv* env, |
77 jobject obj, | 77 jobject obj, |
78 jint empty_background_color, | 78 jint empty_background_color, |
79 jboolean low_mem_device, | 79 jboolean low_mem_device, |
80 ui::WindowAndroid* window_android, | 80 ui::WindowAndroid* window_android, |
81 LayerTitleCache* layer_title_cache, | 81 LayerTitleCache* layer_title_cache, |
82 TabContentManager* tab_content_manager) | 82 TabContentManager* tab_content_manager) |
83 : layer_title_cache_(layer_title_cache), | 83 : layer_title_cache_(layer_title_cache), |
84 tab_content_manager_(tab_content_manager), | 84 tab_content_manager_(tab_content_manager), |
85 root_layer_(cc::SolidColorLayer::Create()), | 85 root_layer_( |
| 86 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())), |
86 toolbar_layer_(ToolbarLayer::Create()), | 87 toolbar_layer_(ToolbarLayer::Create()), |
87 scene_layer_(nullptr), | 88 scene_layer_(nullptr), |
88 current_surface_format_(0), | 89 current_surface_format_(0), |
89 content_width_(0), | 90 content_width_(0), |
90 content_height_(0), | 91 content_height_(0), |
91 overdraw_bottom_height_(0), | 92 overdraw_bottom_height_(0), |
92 overlay_video_mode_(false), | 93 overlay_video_mode_(false), |
93 empty_background_color_(empty_background_color), | 94 empty_background_color_(empty_background_color), |
94 weak_factory_(this) { | 95 weak_factory_(this) { |
95 content::BrowserChildProcessObserver::Add(this); | 96 content::BrowserChildProcessObserver::Add(this); |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 // through here but through BrowserChildProcessHostDisconnected() instead. | 300 // through here but through BrowserChildProcessHostDisconnected() instead. |
300 } | 301 } |
301 | 302 |
302 // Register native methods | 303 // Register native methods |
303 bool RegisterCompositorView(JNIEnv* env) { | 304 bool RegisterCompositorView(JNIEnv* env) { |
304 return RegisterNativesImpl(env); | 305 return RegisterNativesImpl(env); |
305 } | 306 } |
306 | 307 |
307 } // namespace android | 308 } // namespace android |
308 } // namespace chrome | 309 } // namespace chrome |
OLD | NEW |