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

Side by Side Diff: Source/core/editing/PlainTextRange.cpp

Issue 1122723005: Rename renderer to layoutObject in core/editing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/InsertTextCommand.cpp ('k') | Source/core/editing/RenderedPosition.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 textRunEndPosition = it.endPositionInCurrentContainer(); 99 textRunEndPosition = it.endPositionInCurrentContainer();
100 100
101 bool foundStart = start() >= docTextPosition && start() <= docTextPositi on + len; 101 bool foundStart = start() >= docTextPosition && start() <= docTextPositi on + len;
102 bool foundEnd = end() >= docTextPosition && end() <= docTextPosition + l en; 102 bool foundEnd = end() >= docTextPosition && end() <= docTextPosition + l en;
103 103
104 // Fix textRunRange->endPosition(), but only if foundStart || foundEnd, because it is only 104 // Fix textRunRange->endPosition(), but only if foundStart || foundEnd, because it is only
105 // in those cases that textRunRange is used. 105 // in those cases that textRunRange is used.
106 if (foundEnd) { 106 if (foundEnd) {
107 // FIXME: This is a workaround for the fact that the end of a run 107 // FIXME: This is a workaround for the fact that the end of a run
108 // is often at the wrong position for emitted '\n's or if the 108 // is often at the wrong position for emitted '\n's or if the
109 // renderer of the current node is a replaced element. 109 // layoutObject of the current node is a replaced element.
110 if (len == 1 && (it.text().characterAt(0) == '\n' || it.isInsideRepl acedElement())) { 110 if (len == 1 && (it.text().characterAt(0) == '\n' || it.isInsideRepl acedElement())) {
111 it.advance(); 111 it.advance();
112 if (!it.atEnd()) { 112 if (!it.atEnd()) {
113 textRunEndPosition = it.startPositionInCurrentContainer(); 113 textRunEndPosition = it.startPositionInCurrentContainer();
114 } else { 114 } else {
115 Position runEnd = VisiblePosition(textRunStartPosition).next ().deepEquivalent(); 115 Position runEnd = VisiblePosition(textRunStartPosition).next ().deepEquivalent();
116 if (runEnd.isNotNull()) 116 if (runEnd.isNotNull())
117 textRunEndPosition = createLegacyEditingPosition(runEnd. containerNode(), runEnd.computeOffsetInContainerNode()); 117 textRunEndPosition = createLegacyEditingPosition(runEnd. containerNode(), runEnd.computeOffsetInContainerNode());
118 } 118 }
119 } 119 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 size_t start = TextIterator::rangeLength(testRange->startPosition(), testRan ge->endPosition()); 178 size_t start = TextIterator::rangeLength(testRange->startPosition(), testRan ge->endPosition());
179 179
180 testRange->setEnd(range.endContainer(), range.endOffset(), IGNORE_EXCEPTION) ; 180 testRange->setEnd(range.endContainer(), range.endOffset(), IGNORE_EXCEPTION) ;
181 ASSERT(testRange->startContainer() == &scope); 181 ASSERT(testRange->startContainer() == &scope);
182 size_t end = TextIterator::rangeLength(testRange->startPosition(), testRange ->endPosition()); 182 size_t end = TextIterator::rangeLength(testRange->startPosition(), testRange ->endPosition());
183 183
184 return PlainTextRange(start, end); 184 return PlainTextRange(start, end);
185 } 185 }
186 186
187 } 187 }
OLDNEW
« no previous file with comments | « Source/core/editing/InsertTextCommand.cpp ('k') | Source/core/editing/RenderedPosition.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698