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

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

Issue 2154213007: Replace gfx::Rect with gfx::RectF in ui::AXNodeData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix win compile Created 4 years, 5 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_RENDER_ACCESSIBILITY_IMPL_H_ 5 #ifndef CONTENT_RENDERER_ACCESSIBILITY_RENDER_ACCESSIBILITY_IMPL_H_
6 #define CONTENT_RENDERER_ACCESSIBILITY_RENDER_ACCESSIBILITY_IMPL_H_ 6 #define CONTENT_RENDERER_ACCESSIBILITY_RENDER_ACCESSIBILITY_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "content/common/ax_content_node_data.h" 13 #include "content/common/ax_content_node_data.h"
14 #include "content/public/renderer/render_accessibility.h" 14 #include "content/public/renderer/render_accessibility.h"
15 #include "content/public/renderer/render_frame_observer.h" 15 #include "content/public/renderer/render_frame_observer.h"
16 #include "content/renderer/accessibility/blink_ax_tree_source.h" 16 #include "content/renderer/accessibility/blink_ax_tree_source.h"
17 #include "third_party/WebKit/public/web/WebAXObject.h" 17 #include "third_party/WebKit/public/web/WebAXObject.h"
18 #include "ui/accessibility/ax_tree.h" 18 #include "ui/accessibility/ax_tree.h"
19 #include "ui/accessibility/ax_tree_serializer.h" 19 #include "ui/accessibility/ax_tree_serializer.h"
20 #include "ui/gfx/geometry/rect_f.h"
20 21
21 struct AccessibilityHostMsg_EventParams; 22 struct AccessibilityHostMsg_EventParams;
22 23
23 namespace blink { 24 namespace blink {
24 class WebDocument; 25 class WebDocument;
25 class WebNode; 26 class WebNode;
26 }; 27 };
27 28
28 namespace content { 29 namespace content {
29 class RenderFrameImpl; 30 class RenderFrameImpl;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 AXContentTreeData>; 146 AXContentTreeData>;
146 BlinkAXTreeSerializer serializer_; 147 BlinkAXTreeSerializer serializer_;
147 148
148 using PdfAXTreeSerializer = ui::AXTreeSerializer<const ui::AXNode*, 149 using PdfAXTreeSerializer = ui::AXTreeSerializer<const ui::AXNode*,
149 ui::AXNodeData, 150 ui::AXNodeData,
150 ui::AXTreeData>; 151 ui::AXTreeData>;
151 std::unique_ptr<PdfAXTreeSerializer> pdf_serializer_; 152 std::unique_ptr<PdfAXTreeSerializer> pdf_serializer_;
152 PdfAXTreeSource* pdf_tree_source_; 153 PdfAXTreeSource* pdf_tree_source_;
153 154
154 // Current location of every object, so we can detect when it moves. 155 // Current location of every object, so we can detect when it moves.
155 base::hash_map<int, gfx::Rect> locations_; 156 base::hash_map<int, gfx::RectF> locations_;
156 157
157 // The most recently observed scroll offset of the root document element. 158 // The most recently observed scroll offset of the root document element.
158 // TODO(dmazzoni): remove once https://bugs.webkit.org/show_bug.cgi?id=73460 159 // TODO(dmazzoni): remove once https://bugs.webkit.org/show_bug.cgi?id=73460
159 // is fixed. 160 // is fixed.
160 gfx::Size last_scroll_offset_; 161 gfx::Size last_scroll_offset_;
161 162
162 // Set if we are waiting for an accessibility event ack. 163 // Set if we are waiting for an accessibility event ack.
163 bool ack_pending_; 164 bool ack_pending_;
164 165
165 // Nonzero if the browser requested we reset the accessibility state. 166 // Nonzero if the browser requested we reset the accessibility state.
166 // We need to return this token in the next IPC. 167 // We need to return this token in the next IPC.
167 int reset_token_; 168 int reset_token_;
168 169
169 // So we can queue up tasks to be executed later. 170 // So we can queue up tasks to be executed later.
170 base::WeakPtrFactory<RenderAccessibilityImpl> weak_factory_; 171 base::WeakPtrFactory<RenderAccessibilityImpl> weak_factory_;
171 172
172 DISALLOW_COPY_AND_ASSIGN(RenderAccessibilityImpl); 173 DISALLOW_COPY_AND_ASSIGN(RenderAccessibilityImpl);
173 }; 174 };
174 175
175 } // namespace content 176 } // namespace content
176 177
177 #endif // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_ 178 #endif // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_
OLDNEW
« no previous file with comments | « content/renderer/accessibility/blink_ax_tree_source.cc ('k') | content/renderer/accessibility/render_accessibility_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698