| 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | 179 DocumentLifecycle::DisallowTransitionScope disallowTransition(scope.document
().lifecycle()); |
| 180 // needs to be audited. See http://crbug.com/590369 for more details. | |
| 181 scope.document().updateStyleAndLayoutIgnorePendingStylesheets(); | |
| 182 | 180 |
| 183 size_t start = TextIterator::rangeLength(Position(&const_cast<ContainerNode&
>(scope), 0), range.startPosition()); | 181 size_t start = TextIterator::rangeLength(Position(&const_cast<ContainerNode&
>(scope), 0), range.startPosition()); |
| 184 size_t end = TextIterator::rangeLength(Position(&const_cast<ContainerNode&>(
scope), 0), range.endPosition()); | 182 size_t end = TextIterator::rangeLength(Position(&const_cast<ContainerNode&>(
scope), 0), range.endPosition()); |
| 185 | 183 |
| 186 return PlainTextRange(start, end); | 184 return PlainTextRange(start, end); |
| 187 } | 185 } |
| 188 | 186 |
| 189 PlainTextRange PlainTextRange::create(const ContainerNode& scope, const Range& r
ange) | 187 PlainTextRange PlainTextRange::create(const ContainerNode& scope, const Range& r
ange) |
| 190 { | 188 { |
| 191 return create(scope, EphemeralRange(&range)); | 189 return create(scope, EphemeralRange(&range)); |
| 192 } | 190 } |
| 193 | 191 |
| 194 } // namespace blink | 192 } // namespace blink |
| OLD | NEW |