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_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <queue> | 9 #include <queue> |
10 | 10 |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; | 304 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; |
305 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; | 305 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; |
306 scoped_refptr<cc::DelegatedRendererLayer> layer_; | 306 scoped_refptr<cc::DelegatedRendererLayer> layer_; |
307 | 307 |
308 // The most recent texture size that was pushed to the texture layer. | 308 // The most recent texture size that was pushed to the texture layer. |
309 gfx::Size texture_size_in_layer_; | 309 gfx::Size texture_size_in_layer_; |
310 | 310 |
311 // The most recent content size that was pushed to the texture layer. | 311 // The most recent content size that was pushed to the texture layer. |
312 gfx::Size content_size_in_layer_; | 312 gfx::Size content_size_in_layer_; |
313 | 313 |
| 314 // The device scale of the last received frame. |
| 315 float device_scale_factor_; |
| 316 |
314 // The output surface id of the last received frame. | 317 // The output surface id of the last received frame. |
315 uint32_t last_output_surface_id_; | 318 uint32_t last_output_surface_id_; |
316 | 319 |
317 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; | 320 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; |
318 | 321 |
319 std::queue<base::Closure> ack_callbacks_; | 322 std::queue<base::Closure> ack_callbacks_; |
320 | 323 |
321 const bool overscroll_effect_enabled_; | 324 const bool overscroll_effect_enabled_; |
322 // Used to render overscroll overlays. | 325 // Used to render overscroll overlays. |
323 // Note: |overscroll_effect_| will never be NULL, even if it's never enabled. | 326 // Note: |overscroll_effect_| will never be NULL, even if it's never enabled. |
(...skipping 26 matching lines...) Expand all Loading... |
350 }; | 353 }; |
351 | 354 |
352 scoped_ptr<LastFrameInfo> last_frame_info_; | 355 scoped_ptr<LastFrameInfo> last_frame_info_; |
353 | 356 |
354 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); | 357 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); |
355 }; | 358 }; |
356 | 359 |
357 } // namespace content | 360 } // namespace content |
358 | 361 |
359 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 362 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
OLD | NEW |