Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 567923002: Refactoring the weak_ptr_factory order in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 376
377 // The most recent texture size that was pushed to the texture layer. 377 // The most recent texture size that was pushed to the texture layer.
378 gfx::Size texture_size_in_layer_; 378 gfx::Size texture_size_in_layer_;
379 379
380 // The most recent content size that was pushed to the texture layer. 380 // The most recent content size that was pushed to the texture layer.
381 gfx::Size content_size_in_layer_; 381 gfx::Size content_size_in_layer_;
382 382
383 // The output surface id of the last received frame. 383 // The output surface id of the last received frame.
384 uint32_t last_output_surface_id_; 384 uint32_t last_output_surface_id_;
385 385
386 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
387 386
388 std::queue<base::Closure> ack_callbacks_; 387 std::queue<base::Closure> ack_callbacks_;
389 388
390 const bool overscroll_effect_enabled_; 389 const bool overscroll_effect_enabled_;
391 // Used to render overscroll overlays. 390 // Used to render overscroll overlays.
392 scoped_ptr<OverscrollGlow> overscroll_effect_; 391 scoped_ptr<OverscrollGlow> overscroll_effect_;
393 392
394 // Provides gesture synthesis given a stream of touch events (derived from 393 // Provides gesture synthesis given a stream of touch events (derived from
395 // Android MotionEvent's) and touch event acks. 394 // Android MotionEvent's) and touch event acks.
396 ui::FilteredGestureProvider gesture_provider_; 395 ui::FilteredGestureProvider gesture_provider_;
(...skipping 30 matching lines...) Expand all
427 scoped_ptr<LastFrameInfo> last_frame_info_; 426 scoped_ptr<LastFrameInfo> last_frame_info_;
428 427
429 TextSurroundingSelectionCallback text_surrounding_selection_callback_; 428 TextSurroundingSelectionCallback text_surrounding_selection_callback_;
430 429
431 // List of readbackrequests waiting for arrival of a valid frame. 430 // List of readbackrequests waiting for arrival of a valid frame.
432 std::queue<ReadbackRequest> readbacks_waiting_for_frame_; 431 std::queue<ReadbackRequest> readbacks_waiting_for_frame_;
433 432
434 // The last scroll offset of the view. 433 // The last scroll offset of the view.
435 gfx::Vector2dF last_scroll_offset_; 434 gfx::Vector2dF last_scroll_offset_;
436 435
436 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
437
437 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 438 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
438 }; 439 };
439 440
440 } // namespace content 441 } // namespace content
441 442
442 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 443 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698