OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
3 * Copyright (C) 2010 Google Inc. All rights reserved. | 3 * Copyright (C) 2010 Google Inc. All rights reserved. |
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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 if (text == end.computeContainerNode() && text->previousSibling() && text->p
reviousSibling()->isTextNode()) { | 267 if (text == end.computeContainerNode() && text->previousSibling() && text->p
reviousSibling()->isTextNode()) { |
268 ASSERT(end.offsetInContainerNode() < position.offsetInContainerNode()); | 268 ASSERT(end.offsetInContainerNode() < position.offsetInContainerNode()); |
269 end = Position(toText(text->previousSibling()), end.offsetInContainerNod
e()); | 269 end = Position(toText(text->previousSibling()), end.offsetInContainerNod
e()); |
270 } | 270 } |
271 if (text == m_endOfLastParagraph.computeContainerNode()) { | 271 if (text == m_endOfLastParagraph.computeContainerNode()) { |
272 if (m_endOfLastParagraph.offsetInContainerNode() < position.offsetInCont
ainerNode()) { | 272 if (m_endOfLastParagraph.offsetInContainerNode() < position.offsetInCont
ainerNode()) { |
273 // We can only fix endOfLastParagraph if the previous node was still
text and hasn't been modified by script. | 273 // We can only fix endOfLastParagraph if the previous node was still
text and hasn't been modified by script. |
274 if (text->previousSibling()->isTextNode() | 274 if (text->previousSibling()->isTextNode() |
275 && static_cast<unsigned>(m_endOfLastParagraph.offsetInContainerN
ode()) <= toText(text->previousSibling())->length()) | 275 && static_cast<unsigned>(m_endOfLastParagraph.offsetInContainerN
ode()) <= toText(text->previousSibling())->length()) |
276 m_endOfLastParagraph = Position(toText(text->previousSibling()),
m_endOfLastParagraph.offsetInContainerNode()); | 276 m_endOfLastParagraph = Position(toText(text->previousSibling()),
m_endOfLastParagraph.offsetInContainerNode()); |
277 } else | 277 } else { |
278 m_endOfLastParagraph = Position(text.get(), m_endOfLastParagraph.off
setInContainerNode() - 1); | 278 m_endOfLastParagraph = Position(text.get(), m_endOfLastParagraph.off
setInContainerNode() - 1); |
| 279 } |
279 } | 280 } |
280 | 281 |
281 return VisiblePosition(Position(text.get(), position.offsetInContainerNode()
- 1)); | 282 return VisiblePosition(Position(text.get(), position.offsetInContainerNode()
- 1)); |
282 } | 283 } |
283 | 284 |
284 PassRefPtrWillBeRawPtr<HTMLElement> ApplyBlockElementCommand::createBlockElement
() const | 285 PassRefPtrWillBeRawPtr<HTMLElement> ApplyBlockElementCommand::createBlockElement
() const |
285 { | 286 { |
286 RefPtrWillBeRawPtr<HTMLElement> element = createHTMLElement(document(), m_ta
gName); | 287 RefPtrWillBeRawPtr<HTMLElement> element = createHTMLElement(document(), m_ta
gName); |
287 if (m_inlineStyle.length()) | 288 if (m_inlineStyle.length()) |
288 element->setAttribute(styleAttr, m_inlineStyle); | 289 element->setAttribute(styleAttr, m_inlineStyle); |
289 return element.release(); | 290 return element.release(); |
290 } | 291 } |
291 | 292 |
292 DEFINE_TRACE(ApplyBlockElementCommand) | 293 DEFINE_TRACE(ApplyBlockElementCommand) |
293 { | 294 { |
294 visitor->trace(m_endOfLastParagraph); | 295 visitor->trace(m_endOfLastParagraph); |
295 CompositeEditCommand::trace(visitor); | 296 CompositeEditCommand::trace(visitor); |
296 } | 297 } |
297 | 298 |
298 } | 299 } |
OLD | NEW |