| 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; | 318 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; |
| 319 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; | 319 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; |
| 320 scoped_refptr<cc::DelegatedRendererLayer> layer_; | 320 scoped_refptr<cc::DelegatedRendererLayer> layer_; |
| 321 | 321 |
| 322 // The most recent texture size that was pushed to the texture layer. | 322 // The most recent texture size that was pushed to the texture layer. |
| 323 gfx::Size texture_size_in_layer_; | 323 gfx::Size texture_size_in_layer_; |
| 324 | 324 |
| 325 // The most recent content size that was pushed to the texture layer. | 325 // The most recent content size that was pushed to the texture layer. |
| 326 gfx::Size content_size_in_layer_; | 326 gfx::Size content_size_in_layer_; |
| 327 | 327 |
| 328 // The device scale of the last received frame. | |
| 329 float device_scale_factor_; | |
| 330 | |
| 331 // The output surface id of the last received frame. | 328 // The output surface id of the last received frame. |
| 332 uint32_t last_output_surface_id_; | 329 uint32_t last_output_surface_id_; |
| 333 | 330 |
| 334 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; | 331 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; |
| 335 | 332 |
| 336 std::queue<base::Closure> ack_callbacks_; | 333 std::queue<base::Closure> ack_callbacks_; |
| 337 | 334 |
| 338 const bool overscroll_effect_enabled_; | 335 const bool overscroll_effect_enabled_; |
| 339 // Used to render overscroll overlays. | 336 // Used to render overscroll overlays. |
| 340 // Note: |overscroll_effect_| will never be NULL, even if it's never enabled. | 337 // Note: |overscroll_effect_| will never be NULL, even if it's never enabled. |
| 341 scoped_ptr<OverscrollGlow> overscroll_effect_; | 338 scoped_ptr<OverscrollGlow> overscroll_effect_; |
| 339 gfx::PointF last_scroll_update_position_; |
| 342 | 340 |
| 343 // Provides gesture synthesis given a stream of touch events (derived from | 341 // Provides gesture synthesis given a stream of touch events (derived from |
| 344 // Android MotionEvent's) and touch event acks. | 342 // Android MotionEvent's) and touch event acks. |
| 345 ui::FilteredGestureProvider gesture_provider_; | 343 ui::FilteredGestureProvider gesture_provider_; |
| 346 | 344 |
| 347 // Handles gesture based text selection | 345 // Handles gesture based text selection |
| 348 GestureTextSelector gesture_text_selector_; | 346 GestureTextSelector gesture_text_selector_; |
| 349 | 347 |
| 350 bool flush_input_requested_; | 348 bool flush_input_requested_; |
| 351 | 349 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 372 scoped_ptr<LastFrameInfo> last_frame_info_; | 370 scoped_ptr<LastFrameInfo> last_frame_info_; |
| 373 | 371 |
| 374 TextSurroundingSelectionCallback text_surrounding_selection_callback_; | 372 TextSurroundingSelectionCallback text_surrounding_selection_callback_; |
| 375 | 373 |
| 376 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); | 374 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); |
| 377 }; | 375 }; |
| 378 | 376 |
| 379 } // namespace content | 377 } // namespace content |
| 380 | 378 |
| 381 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 379 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| OLD | NEW |