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

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

Issue 1409073004: Return EphemeralRange from Editor::findRangeOfString. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Extract text bounds collecting to a function Created 5 years, 1 month 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 WebLocalFrameImpl& ownerFrame() const 203 WebLocalFrameImpl& ownerFrame() const
204 { 204 {
205 ASSERT(m_ownerFrame); 205 ASSERT(m_ownerFrame);
206 return *m_ownerFrame; 206 return *m_ownerFrame;
207 } 207 }
208 208
209 // Returns the ordinal of the first match in the owner frame. 209 // Returns the ordinal of the first match in the owner frame.
210 int ordinalOfFirstMatch() const; 210 int ordinalOfFirstMatch() const;
211 211
212 PassRefPtrWillBeRawPtr<Range> findStringAndScrollToVisible(const String&, Fi ndOptions);
213
212 RawPtrWillBeMember<WebLocalFrameImpl> m_ownerFrame; 214 RawPtrWillBeMember<WebLocalFrameImpl> m_ownerFrame;
213 215
214 // A way for the main frame to keep track of which frame has an active 216 // A way for the main frame to keep track of which frame has an active
215 // match. Should be 0 for all other frames. 217 // match. Should be 0 for all other frames.
216 RawPtrWillBeMember<WebLocalFrameImpl> m_currentActiveMatchFrame; 218 RawPtrWillBeMember<WebLocalFrameImpl> m_currentActiveMatchFrame;
217 219
218 // The range of the active match for the current frame. 220 // The range of the active match for the current frame.
219 RefPtrWillBeMember<Range> m_activeMatch; 221 RefPtrWillBeMember<Range> m_activeMatch;
220 222
221 // The index of the active match for the current frame. 223 // The index of the active match for the current frame.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // Determines if the rects in the find-in-page matches cache of this frame 288 // Determines if the rects in the find-in-page matches cache of this frame
287 // are invalid and should be recomputed. 289 // are invalid and should be recomputed.
288 bool m_findMatchRectsAreValid; 290 bool m_findMatchRectsAreValid;
289 }; 291 };
290 292
291 } // namespace blink 293 } // namespace blink
292 294
293 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch); 295 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch);
294 296
295 #endif // TextFinder_h 297 #endif // TextFinder_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698