Source/core/editing/iterators/CharacterIterator.cpp - Issue 1227413004: Fix build following r198658.

Side by Side Diff: Source/core/editing/iterators/CharacterIterator.cpp

Issue 1227413004: Fix build following r198658. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 5 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

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.	2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.

3 * Copyright (C) 2005 Alexey Proskuryakov.	3 * Copyright (C) 2005 Alexey Proskuryakov.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108	108

109 template <typename Strategy>	109 template <typename Strategy>

110 EphemeralRangeTemplate<Strategy> CharacterIteratorAlgorithm<Strategy>::range() c onst	110 EphemeralRangeTemplate<Strategy> CharacterIteratorAlgorithm<Strategy>::range() c onst

111 {	111 {

112 EphemeralRangeTemplate<Strategy> range(m_textIterator.range());	112 EphemeralRangeTemplate<Strategy> range(m_textIterator.range());

113 if (m_textIterator.atEnd() \|\| m_textIterator.length() <= 1)	113 if (m_textIterator.atEnd() \|\| m_textIterator.length() <= 1)

114 return range;	114 return range;

115 PositionAlgorithm<Strategy> startPosition = range.startPosition().parentAnch oredEquivalent();	115 PositionAlgorithm<Strategy> startPosition = range.startPosition().parentAnch oredEquivalent();

116 PositionAlgorithm<Strategy> endPosition = range.endPosition().parentAnchored Equivalent();	116 PositionAlgorithm<Strategy> endPosition = range.endPosition().parentAnchored Equivalent();

117 Node* node = startPosition.containerNode();	117 Node* node = startPosition.containerNode();

118 ASSERT(node == endPosition.containerNode());	118 ASSERT_UNUSED(endPosition, node == endPosition.containerNode());

119 int offset = startPosition.offsetInContainerNode() + m_runOffset;	119 int offset = startPosition.offsetInContainerNode() + m_runOffset;

120 return EphemeralRangeTemplate<Strategy>(PositionAlgorithm<Strategy>(node, of fset), PositionAlgorithm<Strategy>(node, offset + 1));	120 return EphemeralRangeTemplate<Strategy>(PositionAlgorithm<Strategy>(node, of fset), PositionAlgorithm<Strategy>(node, offset + 1));

121 }	121 }

122	122

123 template <typename Strategy>	123 template <typename Strategy>

124 Document* CharacterIteratorAlgorithm<Strategy>::ownerDocument() const	124 Document* CharacterIteratorAlgorithm<Strategy>::ownerDocument() const

125 {	125 {

126 return m_textIterator.ownerDocument();	126 return m_textIterator.ownerDocument();

127 }	127 }

128	128

(...skipping 507 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
636 return EphemeralRange(options & Backwards ? inputRange.startPosition () : inputRange.endPosition());	636 return EphemeralRange(options & Backwards ? inputRange.startPosition () : inputRange.endPosition());

637 }	637 }

638	638

639 CharacterIterator computeRangeIterator(inputRange, iteratorFlagsForFindPlain Text);	639 CharacterIterator computeRangeIterator(inputRange, iteratorFlagsForFindPlain Text);

640 return computeRangeIterator.calculateCharacterSubrange(matchStart, matchLeng th);	640 return computeRangeIterator.calculateCharacterSubrange(matchStart, matchLeng th);

641 }	641 }

642	642

643 template class CORE_TEMPLATE_EXPORT CharacterIteratorAlgorithm<EditingStrategy>;	643 template class CORE_TEMPLATE_EXPORT CharacterIteratorAlgorithm<EditingStrategy>;

644	644

645 } // namespace blink	645 } // namespace blink

OLD	NEW