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

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

Issue 2291883003: Ensure clean layout before calling TextIterator::rangeLength in editing code (Closed)
Patch Set: Created 4 years, 3 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
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // because of text fields and textareas. The DOM for those is not 169 // because of text fields and textareas. The DOM for those is not
170 // directly in the document DOM, so ensure that the range does not cross a 170 // directly in the document DOM, so ensure that the range does not cross a
171 // boundary of one of those. 171 // boundary of one of those.
172 Node* startContainer = range.startPosition().computeContainerNode(); 172 Node* startContainer = range.startPosition().computeContainerNode();
173 if (startContainer != &scope && !startContainer->isDescendantOf(&scope)) 173 if (startContainer != &scope && !startContainer->isDescendantOf(&scope))
174 return PlainTextRange(); 174 return PlainTextRange();
175 Node* endContainer = range.endPosition().computeContainerNode(); 175 Node* endContainer = range.endPosition().computeContainerNode();
176 if (endContainer != scope && !endContainer->isDescendantOf(&scope)) 176 if (endContainer != scope && !endContainer->isDescendantOf(&scope))
177 return PlainTextRange(); 177 return PlainTextRange();
178 178
179 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
180 // needs to be audited. See http://crbug.com/590369 for more details.
181 scope.document().updateStyleAndLayoutIgnorePendingStylesheets();
yosin_UTC9 2016/08/30 07:40:24 I hope following patch will hoist this updateLayou
Xiaocheng 2016/08/30 07:42:52 Yeah, there will be such a patch.
182
179 size_t start = TextIterator::rangeLength(Position(&const_cast<ContainerNode& >(scope), 0), range.startPosition()); 183 size_t start = TextIterator::rangeLength(Position(&const_cast<ContainerNode& >(scope), 0), range.startPosition());
180 size_t end = TextIterator::rangeLength(Position(&const_cast<ContainerNode&>( scope), 0), range.endPosition()); 184 size_t end = TextIterator::rangeLength(Position(&const_cast<ContainerNode&>( scope), 0), range.endPosition());
181 185
182 return PlainTextRange(start, end); 186 return PlainTextRange(start, end);
183 } 187 }
184 188
185 PlainTextRange PlainTextRange::create(const ContainerNode& scope, const Range& r ange) 189 PlainTextRange PlainTextRange::create(const ContainerNode& scope, const Range& r ange)
186 { 190 {
187 return create(scope, EphemeralRange(&range)); 191 return create(scope, EphemeralRange(&range));
188 } 192 }
189 193
190 } // namespace blink 194 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698