| 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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; | 336 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; |
| 337 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; | 337 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; |
| 338 scoped_refptr<cc::DelegatedRendererLayer> layer_; | 338 scoped_refptr<cc::DelegatedRendererLayer> layer_; |
| 339 | 339 |
| 340 // The most recent texture size that was pushed to the texture layer. | 340 // The most recent texture size that was pushed to the texture layer. |
| 341 gfx::Size texture_size_in_layer_; | 341 gfx::Size texture_size_in_layer_; |
| 342 | 342 |
| 343 // The most recent content size that was pushed to the texture layer. | 343 // The most recent content size that was pushed to the texture layer. |
| 344 gfx::Size content_size_in_layer_; | 344 gfx::Size content_size_in_layer_; |
| 345 | 345 |
| 346 // The device scale of the last received frame. | |
| 347 float device_scale_factor_; | |
| 348 | |
| 349 // The output surface id of the last received frame. | 346 // The output surface id of the last received frame. |
| 350 uint32_t last_output_surface_id_; | 347 uint32_t last_output_surface_id_; |
| 351 | 348 |
| 352 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; | 349 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; |
| 353 | 350 |
| 354 std::queue<base::Closure> ack_callbacks_; | 351 std::queue<base::Closure> ack_callbacks_; |
| 355 | 352 |
| 356 const bool overscroll_effect_enabled_; | 353 const bool overscroll_effect_enabled_; |
| 357 // Used to render overscroll overlays. | 354 // Used to render overscroll overlays. |
| 358 scoped_ptr<OverscrollGlow> overscroll_effect_; | 355 scoped_ptr<OverscrollGlow> overscroll_effect_; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 scoped_ptr<LastFrameInfo> last_frame_info_; | 392 scoped_ptr<LastFrameInfo> last_frame_info_; |
| 396 | 393 |
| 397 TextSurroundingSelectionCallback text_surrounding_selection_callback_; | 394 TextSurroundingSelectionCallback text_surrounding_selection_callback_; |
| 398 | 395 |
| 399 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); | 396 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); |
| 400 }; | 397 }; |
| 401 | 398 |
| 402 } // namespace content | 399 } // namespace content |
| 403 | 400 |
| 404 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 401 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| OLD | NEW |