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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2546513002: Refactor TextFinder::scopeStringMatches(). (Closed)
Patch Set: Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/tests/TextFinderTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index ade7eb5229740517156b9be6fb893607ccaad600..97c161a507bee2c56bb612039508234663f193b0 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -4647,9 +4647,10 @@ TEST_P(ParameterizedWebFrameTest, FindInPageMatchRects) {
mainFrame->ensureTextFinder().resetMatchCount();
for (WebLocalFrameImpl* frame = mainFrame; frame;
- frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
- frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
- options, true);
+ frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+ frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchText, options);
+ }
runPendingTasks();
EXPECT_TRUE(client.findResultsAreReady());
@@ -4710,18 +4711,20 @@ TEST_F(WebFrameTest, FindInPageActiveIndex) {
mainFrame->ensureTextFinder().resetMatchCount();
for (WebLocalFrameImpl* frame = mainFrame; frame;
- frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
- frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
- options, true);
+ frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+ frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchText, options);
+ }
runPendingTasks();
EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false));
mainFrame->stopFinding(WebLocalFrame::StopFindActionClearSelection);
for (WebLocalFrameImpl* frame = mainFrame; frame;
- frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
- frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
- options, true);
+ frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+ frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchText, options);
+ }
runPendingTasks();
EXPECT_TRUE(client.findResultsAreReady());
@@ -4734,9 +4737,10 @@ TEST_F(WebFrameTest, FindInPageActiveIndex) {
mainFrame->ensureTextFinder().resetMatchCount();
for (WebLocalFrameImpl* frame = mainFrame; frame;
- frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
- frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchTextNew,
- options, true);
+ frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+ frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchTextNew, options);
+ }
runPendingTasks();
EXPECT_TRUE(client.findResultsAreReady());
@@ -4775,9 +4779,10 @@ TEST_P(ParameterizedWebFrameTest, FindOnDetachedFrame) {
mainFrame->ensureTextFinder().resetMatchCount();
for (WebLocalFrameImpl* frame = mainFrame; frame;
- frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
- frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
- options, true);
+ frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+ frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchText, options);
+ }
runPendingTasks();
EXPECT_TRUE(client.findResultsAreReady());
@@ -4814,9 +4819,10 @@ TEST_P(ParameterizedWebFrameTest, FindDetachFrameBeforeScopeStrings) {
mainFrame->ensureTextFinder().resetMatchCount();
for (WebLocalFrameImpl* frame = mainFrame; frame;
- frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
- frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
- options, true);
+ frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+ frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchText, options);
+ }
runPendingTasks();
EXPECT_TRUE(client.findResultsAreReady());
@@ -4850,12 +4856,13 @@ TEST_P(ParameterizedWebFrameTest, FindDetachFrameWhileScopingStrings) {
mainFrame->ensureTextFinder().resetMatchCount();
for (WebLocalFrameImpl* frame = mainFrame; frame;
- frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
- frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
- options, true);
+ frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+ frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchText, options);
+ }
- // The first scopeStringMatches will have reset the state. Detach before it
- // actually scopes.
+ // The first startScopingStringMatches will have reset the state. Detach
+ // before it actually scopes.
removeElementById(mainFrame, "frame");
runPendingTasks();
@@ -4910,8 +4917,8 @@ TEST_P(ParameterizedWebFrameTest, SetTickmarks) {
EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false));
mainFrame->ensureTextFinder().resetMatchCount();
- mainFrame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
- options, true);
+ mainFrame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+ searchText, options);
runPendingTasks();
EXPECT_TRUE(client.findResultsAreReady());
@@ -4962,8 +4969,8 @@ TEST_P(ParameterizedWebFrameTest, FindInPageJavaScriptUpdatesDOM) {
bool activeNow;
frame->ensureTextFinder().resetMatchCount();
- frame->ensureTextFinder().scopeStringMatches(findIdentifier, searchText,
- options, true);
+ frame->ensureTextFinder().startScopingStringMatches(findIdentifier,
+ searchText, options);
runPendingTasks();
EXPECT_TRUE(client.findResultsAreReady());
« no previous file with comments | « third_party/WebKit/Source/web/tests/TextFinderTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698