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

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

Issue 1675163002: Rename ComposedTree to FlatTree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wip 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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 options, 392 options,
393 false); // don't reset. 393 false); // don't reset.
394 return; // Done for now, resume work later. 394 return; // Done for now, resume work later.
395 } 395 }
396 396
397 finishCurrentScopingEffort(identifier); 397 finishCurrentScopingEffort(identifier);
398 } 398 }
399 399
400 void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, const WebFindOptions& options, bool reset) 400 void TextFinder::scopeStringMatches(int identifier, const WebString& searchText, const WebFindOptions& options, bool reset)
401 { 401 {
402 if (RuntimeEnabledFeatures::selectionForComposedTreeEnabled()) 402 if (RuntimeEnabledFeatures::selectionForFlatTreeEnabled())
403 return scopeStringMatchesAlgorithm<EditingInComposedTreeStrategy>(identi fier, searchText, options, reset); 403 return scopeStringMatchesAlgorithm<EditingInFlatTreeStrategy>(identifier , searchText, options, reset);
404 scopeStringMatchesAlgorithm<EditingStrategy>(identifier, searchText, options , reset); 404 scopeStringMatchesAlgorithm<EditingStrategy>(identifier, searchText, options , reset);
405 } 405 }
406 406
407 void TextFinder::flushCurrentScopingEffort(int identifier) 407 void TextFinder::flushCurrentScopingEffort(int identifier)
408 { 408 {
409 if (!ownerFrame().frame() || !ownerFrame().frame()->page()) 409 if (!ownerFrame().frame() || !ownerFrame().frame()->page())
410 return; 410 return;
411 411
412 WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl(); 412 WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
413 mainFrameImpl->ensureTextFinder().decrementFramesScopingCount(identifier); 413 mainFrameImpl->ensureTextFinder().decrementFramesScopingCount(identifier);
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 visitor->trace(m_ownerFrame); 815 visitor->trace(m_ownerFrame);
816 visitor->trace(m_currentActiveMatchFrame); 816 visitor->trace(m_currentActiveMatchFrame);
817 visitor->trace(m_activeMatch); 817 visitor->trace(m_activeMatch);
818 visitor->trace(m_resumeScopingFromRange); 818 visitor->trace(m_resumeScopingFromRange);
819 visitor->trace(m_deferredScopingWork); 819 visitor->trace(m_deferredScopingWork);
820 visitor->trace(m_findMatchesCache); 820 visitor->trace(m_findMatchesCache);
821 #endif 821 #endif
822 } 822 }
823 823
824 } // namespace blink 824 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698