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

Side by Side Diff: content/renderer/accessibility/renderer_accessibility_complete.h

Issue 598483002: Fix WeakPtrFactory member ordering in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed order of friend class Created 6 years, 2 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_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_ 5 #ifndef CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_
6 #define CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_ 6 #define CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void OnDoDefaultAction(int acc_obj_id); 65 void OnDoDefaultAction(int acc_obj_id);
66 void OnEventsAck(); 66 void OnEventsAck();
67 void OnChangeScrollPosition(int acc_obj_id, int scroll_x, int scroll_y); 67 void OnChangeScrollPosition(int acc_obj_id, int scroll_x, int scroll_y);
68 void OnScrollToMakeVisible(int acc_obj_id, gfx::Rect subfocus); 68 void OnScrollToMakeVisible(int acc_obj_id, gfx::Rect subfocus);
69 void OnScrollToPoint(int acc_obj_id, gfx::Point point); 69 void OnScrollToPoint(int acc_obj_id, gfx::Point point);
70 void OnSetFocus(int acc_obj_id); 70 void OnSetFocus(int acc_obj_id);
71 void OnSetTextSelection(int acc_obj_id, int start_offset, int end_offset); 71 void OnSetTextSelection(int acc_obj_id, int start_offset, int end_offset);
72 void OnHitTest(gfx::Point point); 72 void OnHitTest(gfx::Point point);
73 void OnFatalError(); 73 void OnFatalError();
74 74
75 // So we can queue up tasks to be executed later.
76 base::WeakPtrFactory<RendererAccessibilityComplete> weak_factory_;
77
78 // Events from Blink are collected until they are ready to be 75 // Events from Blink are collected until they are ready to be
79 // sent to the browser. 76 // sent to the browser.
80 std::vector<AccessibilityHostMsg_EventParams> pending_events_; 77 std::vector<AccessibilityHostMsg_EventParams> pending_events_;
81 78
82 // The adapter that exposes Blink's accessibility tree to AXTreeSerializer. 79 // The adapter that exposes Blink's accessibility tree to AXTreeSerializer.
83 BlinkAXTreeSource tree_source_; 80 BlinkAXTreeSource tree_source_;
84 81
85 // The serializer that sends accessibility messages to the browser process. 82 // The serializer that sends accessibility messages to the browser process.
86 ui::AXTreeSerializer<blink::WebAXObject> serializer_; 83 ui::AXTreeSerializer<blink::WebAXObject> serializer_;
87 84
88 // Current location of every object, so we can detect when it moves. 85 // Current location of every object, so we can detect when it moves.
89 base::hash_map<int, gfx::Rect> locations_; 86 base::hash_map<int, gfx::Rect> locations_;
90 87
91 // The most recently observed scroll offset of the root document element. 88 // The most recently observed scroll offset of the root document element.
92 // TODO(dmazzoni): remove once https://bugs.webkit.org/show_bug.cgi?id=73460 89 // TODO(dmazzoni): remove once https://bugs.webkit.org/show_bug.cgi?id=73460
93 // is fixed. 90 // is fixed.
94 gfx::Size last_scroll_offset_; 91 gfx::Size last_scroll_offset_;
95 92
96 // Set if we are waiting for an accessibility event ack. 93 // Set if we are waiting for an accessibility event ack.
97 bool ack_pending_; 94 bool ack_pending_;
98 95
96 // So we can queue up tasks to be executed later.
97 base::WeakPtrFactory<RendererAccessibilityComplete> weak_factory_;
98
99 DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityComplete); 99 DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityComplete);
100 }; 100 };
101 101
102 #endif // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_ 102 #endif // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_
103 103
104 } // namespace content 104 } // namespace content
OLDNEW
« no previous file with comments | « content/child/child_thread.cc ('k') | content/renderer/accessibility/renderer_accessibility_complete.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698