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

Side by Side Diff: third_party/WebKit/Source/core/editing/Editor.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) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 void addToKillRing(const EphemeralRange&); 196 void addToKillRing(const EphemeralRange&);
197 197
198 void pasteAsFragment(PassRefPtrWillBeRawPtr<DocumentFragment>, bool smartRep lace, bool matchStyle); 198 void pasteAsFragment(PassRefPtrWillBeRawPtr<DocumentFragment>, bool smartRep lace, bool matchStyle);
199 void pasteAsPlainText(const String&, bool smartReplace); 199 void pasteAsPlainText(const String&, bool smartReplace);
200 200
201 Element* findEventTargetFrom(const VisibleSelection&) const; 201 Element* findEventTargetFrom(const VisibleSelection&) const;
202 202
203 bool findString(const String&, FindOptions); 203 bool findString(const String&, FindOptions);
204 204
205 PassRefPtrWillBeRawPtr<Range> findStringAndScrollToVisible(const String&, Ra nge*, FindOptions); 205 EphemeralRange findStringAndScrollToVisible(const String&, const EphemeralRa nge&, FindOptions);
206 PassRefPtrWillBeRawPtr<Range> findRangeOfString(const String& target, const EphemeralRange& referenceRange, FindOptions); 206 EphemeralRangeInComposedTree findStringAndScrollToVisible(const String&, con st EphemeralRangeInComposedTree&, FindOptions);
207 PassRefPtrWillBeRawPtr<Range> findRangeOfString(const String& target, const EphemeralRangeInComposedTree& referenceRange, FindOptions); 207 EphemeralRange findRangeOfString(const String& target, const EphemeralRange& referenceRange, FindOptions);
208 EphemeralRangeInComposedTree findRangeOfString(const String& target, const E phemeralRangeInComposedTree& referenceRange, FindOptions);
208 209
209 const VisibleSelection& mark() const; // Mark, to be used as emacs uses it. 210 const VisibleSelection& mark() const; // Mark, to be used as emacs uses it.
210 void setMark(const VisibleSelection&); 211 void setMark(const VisibleSelection&);
211 212
212 void computeAndSetTypingStyle(StylePropertySet* , EditAction = EditActionUns pecified); 213 void computeAndSetTypingStyle(StylePropertySet* , EditAction = EditActionUns pecified);
213 214
214 IntRect firstRectForRange(const EphemeralRange&) const; 215 IntRect firstRectForRange(const EphemeralRange&) const;
215 IntRect firstRectForRange(const Range*) const; 216 IntRect firstRectForRange(const Range*) const;
216 217
217 void respondToChangedSelection(const VisibleSelection& oldSelection, FrameSe lection::SetSelectionOptions); 218 void respondToChangedSelection(const VisibleSelection& oldSelection, FrameSe lection::SetSelectionOptions);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 302
302 inline bool Editor::markedTextMatchesAreHighlighted() const 303 inline bool Editor::markedTextMatchesAreHighlighted() const
303 { 304 {
304 return m_areMarkedTextMatchesHighlighted; 305 return m_areMarkedTextMatchesHighlighted;
305 } 306 }
306 307
307 308
308 } // namespace blink 309 } // namespace blink
309 310
310 #endif // Editor_h 311 #endif // Editor_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698