Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/cancelable_callback.h" | 9 #include "base/cancelable_callback.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 current_composite_task_->Cancel(); | 125 current_composite_task_->Cancel(); |
| 126 current_composite_task_.reset(); | 126 current_composite_task_.reset(); |
| 127 composite_on_vsync_trigger_ = DO_NOT_COMPOSITE; | 127 composite_on_vsync_trigger_ = DO_NOT_COMPOSITE; |
| 128 will_composite_immediately_ = false; | 128 will_composite_immediately_ = false; |
| 129 } | 129 } |
| 130 cc::UIResourceId GenerateUIResourceFromUIResourceBitmap( | 130 cc::UIResourceId GenerateUIResourceFromUIResourceBitmap( |
| 131 const cc::UIResourceBitmap& bitmap, | 131 const cc::UIResourceBitmap& bitmap, |
| 132 bool is_transient); | 132 bool is_transient); |
| 133 void OnGpuChannelEstablished(); | 133 void OnGpuChannelEstablished(); |
| 134 | 134 |
| 135 scoped_refptr<cc::Layer> root_layer_; | 135 scoped_refptr<cc::Layer> root_layer_; |
|
no sievers
2014/07/18 17:59:43
nit: how about a comment saying that root_layer_ i
aelias_OOO_until_Jul13
2014/07/18 18:25:14
Done.
| |
| 136 scoped_refptr<cc::Layer> subroot_layer_; | |
| 136 scoped_ptr<cc::LayerTreeHost> host_; | 137 scoped_ptr<cc::LayerTreeHost> host_; |
| 137 content::UIResourceProviderImpl ui_resource_provider_; | 138 content::UIResourceProviderImpl ui_resource_provider_; |
| 138 | 139 |
| 139 gfx::Size size_; | 140 gfx::Size size_; |
| 140 bool has_transparent_background_; | 141 bool has_transparent_background_; |
| 141 float device_scale_factor_; | 142 float device_scale_factor_; |
| 142 | 143 |
| 143 ANativeWindow* window_; | 144 ANativeWindow* window_; |
| 144 int surface_id_; | 145 int surface_id_; |
| 145 | 146 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 base::TimeTicks last_vsync_; | 179 base::TimeTicks last_vsync_; |
| 179 | 180 |
| 180 base::WeakPtrFactory<CompositorImpl> weak_factory_; | 181 base::WeakPtrFactory<CompositorImpl> weak_factory_; |
| 181 | 182 |
| 182 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); | 183 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); |
| 183 }; | 184 }; |
| 184 | 185 |
| 185 } // namespace content | 186 } // namespace content |
| 186 | 187 |
| 187 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ | 188 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ |
| OLD | NEW |