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

Side by Side Diff: third_party/WebKit/Source/web/TextFinder.cpp

Issue 2858493002: Rename AXObject to AXObjectImpl in modules/ and web/ (Closed)
Patch Set: Fixed rebase Created 3 years, 7 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 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 #include "core/editing/VisibleSelection.h" 38 #include "core/editing/VisibleSelection.h"
39 #include "core/editing/iterators/SearchBuffer.h" 39 #include "core/editing/iterators/SearchBuffer.h"
40 #include "core/editing/markers/DocumentMarker.h" 40 #include "core/editing/markers/DocumentMarker.h"
41 #include "core/editing/markers/DocumentMarkerController.h" 41 #include "core/editing/markers/DocumentMarkerController.h"
42 #include "core/exported/WebViewBase.h" 42 #include "core/exported/WebViewBase.h"
43 #include "core/frame/FrameView.h" 43 #include "core/frame/FrameView.h"
44 #include "core/frame/WebLocalFrameBase.h" 44 #include "core/frame/WebLocalFrameBase.h"
45 #include "core/layout/LayoutObject.h" 45 #include "core/layout/LayoutObject.h"
46 #include "core/layout/TextAutosizer.h" 46 #include "core/layout/TextAutosizer.h"
47 #include "core/page/Page.h" 47 #include "core/page/Page.h"
48 #include "modules/accessibility/AXObject.h"
49 #include "modules/accessibility/AXObjectCacheImpl.h" 48 #include "modules/accessibility/AXObjectCacheImpl.h"
49 #include "modules/accessibility/AXObjectImpl.h"
50 #include "platform/RuntimeEnabledFeatures.h" 50 #include "platform/RuntimeEnabledFeatures.h"
51 #include "platform/Timer.h" 51 #include "platform/Timer.h"
52 #include "platform/wtf/CurrentTime.h" 52 #include "platform/wtf/CurrentTime.h"
53 #include "public/platform/WebVector.h" 53 #include "public/platform/WebVector.h"
54 #include "public/web/WebAXObject.h" 54 #include "public/web/WebAXObject.h"
55 #include "public/web/WebFindOptions.h" 55 #include "public/web/WebFindOptions.h"
56 #include "public/web/WebFrameClient.h" 56 #include "public/web/WebFrameClient.h"
57 #include "public/web/WebViewClient.h" 57 #include "public/web/WebViewClient.h"
58 58
59 namespace blink { 59 namespace blink {
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 void TextFinder::ReportFindInPageResultToAccessibility(int identifier) { 246 void TextFinder::ReportFindInPageResultToAccessibility(int identifier) {
247 if (!active_match_) 247 if (!active_match_)
248 return; 248 return;
249 249
250 AXObjectCacheImpl* ax_object_cache = ToAXObjectCacheImpl( 250 AXObjectCacheImpl* ax_object_cache = ToAXObjectCacheImpl(
251 OwnerFrame().GetFrame()->GetDocument()->ExistingAXObjectCache()); 251 OwnerFrame().GetFrame()->GetDocument()->ExistingAXObjectCache());
252 if (!ax_object_cache) 252 if (!ax_object_cache)
253 return; 253 return;
254 254
255 AXObject* start_object = 255 AXObjectImpl* start_object =
256 ax_object_cache->Get(active_match_->startContainer()); 256 ax_object_cache->Get(active_match_->startContainer());
257 AXObject* end_object = ax_object_cache->Get(active_match_->endContainer()); 257 AXObjectImpl* end_object =
258 ax_object_cache->Get(active_match_->endContainer());
258 if (!start_object || !end_object) 259 if (!start_object || !end_object)
259 return; 260 return;
260 261
261 // Notify the client of new text marker data. 262 // Notify the client of new text marker data.
262 ax_object_cache->PostNotification( 263 ax_object_cache->PostNotification(
263 start_object, AXObjectCache::AXNotification::kAXChildrenChanged); 264 start_object, AXObjectCache::AXNotification::kAXChildrenChanged);
264 if (start_object != end_object) 265 if (start_object != end_object)
265 ax_object_cache->PostNotification( 266 ax_object_cache->PostNotification(
266 end_object, AXObjectCache::AXNotification::kAXChildrenChanged); 267 end_object, AXObjectCache::AXNotification::kAXChildrenChanged);
267 268
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 790
790 DEFINE_TRACE(TextFinder) { 791 DEFINE_TRACE(TextFinder) {
791 visitor->Trace(owner_frame_); 792 visitor->Trace(owner_frame_);
792 visitor->Trace(active_match_); 793 visitor->Trace(active_match_);
793 visitor->Trace(resume_scoping_from_range_); 794 visitor->Trace(resume_scoping_from_range_);
794 visitor->Trace(deferred_scoping_work_); 795 visitor->Trace(deferred_scoping_work_);
795 visitor->Trace(find_matches_cache_); 796 visitor->Trace(find_matches_cache_);
796 } 797 }
797 798
798 } // namespace blink 799 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.cpp ('k') | third_party/WebKit/Source/web/WebAXObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698