| OLD | NEW |
| 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 2108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2119 // | 2119 // |
| 2120 // If none of these cases are true, then we just report the current match | 2120 // If none of these cases are true, then we just report the current match |
| 2121 // count without scoping. | 2121 // count without scoping. |
| 2122 if (/* (1) */ options.findNext && /* (2) */ currentSelection.isNull() && | 2122 if (/* (1) */ options.findNext && /* (2) */ currentSelection.isNull() && |
| 2123 /* (3) */ !(result && !activeNow)) { | 2123 /* (3) */ !(result && !activeNow)) { |
| 2124 // Force report of the actual count. | 2124 // Force report of the actual count. |
| 2125 increaseMatchCount(0, identifier); | 2125 increaseMatchCount(0, identifier); |
| 2126 return; | 2126 return; |
| 2127 } | 2127 } |
| 2128 | 2128 |
| 2129 // Scoping effort begins. | |
| 2130 ensureTextFinder().resetMatchCount(); | |
| 2131 textFinder()->cancelPendingScopingEffort(); | |
| 2132 | |
| 2133 // Start a new scoping request. If the scoping function determines that it | 2129 // Start a new scoping request. If the scoping function determines that it |
| 2134 // needs to scope, it will defer until later. | 2130 // needs to scope, it will defer until later. |
| 2135 textFinder()->scopeStringMatches(identifier, searchText, options, | 2131 ensureTextFinder().startScopingStringMatches(identifier, searchText, options); |
| 2136 true /* reset */); | |
| 2137 } | 2132 } |
| 2138 | 2133 |
| 2139 bool WebLocalFrameImpl::find(int identifier, | 2134 bool WebLocalFrameImpl::find(int identifier, |
| 2140 const WebString& searchText, | 2135 const WebString& searchText, |
| 2141 const WebFindOptions& options, | 2136 const WebFindOptions& options, |
| 2142 bool wrapWithinFrame, | 2137 bool wrapWithinFrame, |
| 2143 bool* activeNow) { | 2138 bool* activeNow) { |
| 2144 if (!frame()) | 2139 if (!frame()) |
| 2145 return false; | 2140 return false; |
| 2146 | 2141 |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2341 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2336 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2342 } | 2337 } |
| 2343 UseCounter::count(frame(), feature); | 2338 UseCounter::count(frame(), feature); |
| 2344 } | 2339 } |
| 2345 | 2340 |
| 2346 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2341 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
| 2347 return m_inputMethodController.get(); | 2342 return m_inputMethodController.get(); |
| 2348 } | 2343 } |
| 2349 | 2344 |
| 2350 } // namespace blink | 2345 } // namespace blink |
| OLD | NEW |