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

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

Issue 1707083002: Fix find in page behavior (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android_webview test Created 4 years, 10 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 } 202 }
203 203
204 void TextFinder::stopFindingAndClearSelection() 204 void TextFinder::stopFindingAndClearSelection()
205 { 205 {
206 cancelPendingScopingEffort(); 206 cancelPendingScopingEffort();
207 207
208 // Remove all markers for matches found and turn off the highlighting. 208 // Remove all markers for matches found and turn off the highlighting.
209 ownerFrame().frame()->document()->markers().removeMarkers(DocumentMarker::Te xtMatch); 209 ownerFrame().frame()->document()->markers().removeMarkers(DocumentMarker::Te xtMatch);
210 ownerFrame().frame()->editor().setMarkedTextMatchesAreHighlighted(false); 210 ownerFrame().frame()->editor().setMarkedTextMatchesAreHighlighted(false);
211 clearFindMatchesCache(); 211 clearFindMatchesCache();
212 resetActiveMatch();
212 213
213 // Let the frame know that we don't want tickmarks anymore. 214 // Let the frame know that we don't want tickmarks anymore.
214 ownerFrame().frameView()->invalidatePaintForTickmarks(); 215 ownerFrame().frameView()->invalidatePaintForTickmarks();
215 } 216 }
216 217
217 void TextFinder::reportFindInPageResultToAccessibility(int identifier) 218 void TextFinder::reportFindInPageResultToAccessibility(int identifier)
218 { 219 {
219 AXObjectCacheImpl* axObjectCache = toAXObjectCacheImpl(ownerFrame().frame()- >document()->existingAXObjectCache()); 220 AXObjectCacheImpl* axObjectCache = toAXObjectCacheImpl(ownerFrame().frame()- >document()->existingAXObjectCache());
220 if (!axObjectCache) 221 if (!axObjectCache)
221 return; 222 return;
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 visitor->trace(m_ownerFrame); 808 visitor->trace(m_ownerFrame);
808 visitor->trace(m_currentActiveMatchFrame); 809 visitor->trace(m_currentActiveMatchFrame);
809 visitor->trace(m_activeMatch); 810 visitor->trace(m_activeMatch);
810 visitor->trace(m_resumeScopingFromRange); 811 visitor->trace(m_resumeScopingFromRange);
811 visitor->trace(m_deferredScopingWork); 812 visitor->trace(m_deferredScopingWork);
812 visitor->trace(m_findMatchesCache); 813 visitor->trace(m_findMatchesCache);
813 #endif 814 #endif
814 } 815 }
815 816
816 } // namespace blink 817 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698