| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple Computer, 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 ContainerNode* currentNode = startingNode; | 61 ContainerNode* currentNode = startingNode; |
| 62 ContainerNode* topNodeWithStartingStyle = nullptr; | 62 ContainerNode* topNodeWithStartingStyle = nullptr; |
| 63 while (currentNode != rootNode) { | 63 while (currentNode != rootNode) { |
| 64 if (currentNode->parentNode() != rootNode && isRemovableBlock(curren
tNode)) | 64 if (currentNode->parentNode() != rootNode && isRemovableBlock(curren
tNode)) |
| 65 nodesToRemove.append(currentNode); | 65 nodesToRemove.append(currentNode); |
| 66 | 66 |
| 67 currentNode = currentNode->parentNode(); | 67 currentNode = currentNode->parentNode(); |
| 68 if (!currentNode) | 68 if (!currentNode) |
| 69 break; | 69 break; |
| 70 | 70 |
| 71 if (!currentNode->renderer() || !currentNode->renderer()->isLayoutIn
line() || toLayoutInline(currentNode->renderer())->alwaysCreateLineBoxes()) | 71 if (!currentNode->layoutObject() || !currentNode->layoutObject()->is
LayoutInline() || toLayoutInline(currentNode->layoutObject())->alwaysCreateLineB
oxes()) |
| 72 continue; | 72 continue; |
| 73 | 73 |
| 74 if (currentNode->firstChild() != currentNode->lastChild()) { | 74 if (currentNode->firstChild() != currentNode->lastChild()) { |
| 75 topNodeWithStartingStyle = 0; | 75 topNodeWithStartingStyle = 0; |
| 76 break; | 76 break; |
| 77 } | 77 } |
| 78 | 78 |
| 79 if (!currentNode->layoutStyle()->visualInvalidationDiff(*startingSty
le).hasDifference()) | 79 if (!currentNode->layoutStyle()->visualInvalidationDiff(*startingSty
le).hasDifference()) |
| 80 topNodeWithStartingStyle = currentNode; | 80 topNodeWithStartingStyle = currentNode; |
| 81 | 81 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } | 122 } |
| 123 | 123 |
| 124 DEFINE_TRACE(SimplifyMarkupCommand) | 124 DEFINE_TRACE(SimplifyMarkupCommand) |
| 125 { | 125 { |
| 126 visitor->trace(m_firstNode); | 126 visitor->trace(m_firstNode); |
| 127 visitor->trace(m_nodeAfterLast); | 127 visitor->trace(m_nodeAfterLast); |
| 128 CompositeEditCommand::trace(visitor); | 128 CompositeEditCommand::trace(visitor); |
| 129 } | 129 } |
| 130 | 130 |
| 131 } // namespace blink | 131 } // namespace blink |
| OLD | NEW |