| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 typingAddedToOpenCommand(InsertParagraphSeparatorInQuotedContent); | 383 typingAddedToOpenCommand(InsertParagraphSeparatorInQuotedContent); |
| 384 } | 384 } |
| 385 | 385 |
| 386 bool TypingCommand::makeEditableRootEmpty() | 386 bool TypingCommand::makeEditableRootEmpty() |
| 387 { | 387 { |
| 388 Element* root = endingSelection().rootEditableElement(); | 388 Element* root = endingSelection().rootEditableElement(); |
| 389 if (!root || !root->hasChildren()) | 389 if (!root || !root->hasChildren()) |
| 390 return false; | 390 return false; |
| 391 | 391 |
| 392 if (root->firstChild() == root->lastChild()) { | 392 if (root->firstChild() == root->lastChild()) { |
| 393 Element* firstElementChild = ElementTraversal::firstWithin(*root); | 393 if (isHTMLBRElement(root->firstChild())) { |
| 394 if (isHTMLBRElement(firstElementChild)) { | |
| 395 // If there is a single child and it could be a placeholder, leave i
t alone. | 394 // If there is a single child and it could be a placeholder, leave i
t alone. |
| 396 if (root->renderer() && root->renderer()->isRenderBlockFlow()) | 395 if (root->renderer() && root->renderer()->isRenderBlockFlow()) |
| 397 return false; | 396 return false; |
| 398 } | 397 } |
| 399 } | 398 } |
| 400 | 399 |
| 401 while (Node* child = root->firstChild()) | 400 while (Node* child = root->firstChild()) |
| 402 removeNode(child); | 401 removeNode(child); |
| 403 | 402 |
| 404 addBlockPlaceholderIfNeeded(root); | 403 addBlockPlaceholderIfNeeded(root); |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 ASSERT_NOT_REACHED(); | 624 ASSERT_NOT_REACHED(); |
| 626 m_preservesTypingStyle = false; | 625 m_preservesTypingStyle = false; |
| 627 } | 626 } |
| 628 | 627 |
| 629 bool TypingCommand::isTypingCommand() const | 628 bool TypingCommand::isTypingCommand() const |
| 630 { | 629 { |
| 631 return true; | 630 return true; |
| 632 } | 631 } |
| 633 | 632 |
| 634 } // namespace blink | 633 } // namespace blink |
| OLD | NEW |