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

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

Issue 2186113002: Fix find-in-page re-scope across frame boundaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 1988 matching lines...) Expand 10 before | Expand all | Expand 10 after
1999 { 1999 {
2000 ensureTextFinder().scopeStringMatches(identifier, searchText, options, reset ); 2000 ensureTextFinder().scopeStringMatches(identifier, searchText, options, reset );
2001 } 2001 }
2002 2002
2003 void WebLocalFrameImpl::cancelPendingScopingEffort() 2003 void WebLocalFrameImpl::cancelPendingScopingEffort()
2004 { 2004 {
2005 if (m_textFinder) 2005 if (m_textFinder)
2006 m_textFinder->cancelPendingScopingEffort(); 2006 m_textFinder->cancelPendingScopingEffort();
2007 } 2007 }
2008 2008
2009 bool WebLocalFrameImpl::scopingInProgress()
2010 {
2011 return m_textFinder ? m_textFinder->scopingInProgress() : false;
2012 }
2013
2009 void WebLocalFrameImpl::increaseMatchCount(int count, int identifier) 2014 void WebLocalFrameImpl::increaseMatchCount(int count, int identifier)
2010 { 2015 {
2011 ensureTextFinder().increaseMatchCount(identifier, count); 2016 ensureTextFinder().increaseMatchCount(identifier, count);
2012 } 2017 }
2013 2018
2014 void WebLocalFrameImpl::resetMatchCount() 2019 void WebLocalFrameImpl::resetMatchCount()
2015 { 2020 {
2016 ensureTextFinder().resetMatchCount(); 2021 ensureTextFinder().resetMatchCount();
2017 } 2022 }
2018 2023
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
2147 { 2152 {
2148 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2153 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2149 } 2154 }
2150 2155
2151 void WebLocalFrameImpl::clearActiveFindMatch() 2156 void WebLocalFrameImpl::clearActiveFindMatch()
2152 { 2157 {
2153 ensureTextFinder().clearActiveFindMatch(); 2158 ensureTextFinder().clearActiveFindMatch();
2154 } 2159 }
2155 2160
2156 } // namespace blink 2161 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698