| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // without affecting the style. The goal is to produce leaner markup even wh
en starting | 48 // without affecting the style. The goal is to produce leaner markup even wh
en starting |
| 49 // from a verbose fragment. | 49 // from a verbose fragment. |
| 50 // We look at inline elements as well as non top level divs that don't have
attributes. | 50 // We look at inline elements as well as non top level divs that don't have
attributes. |
| 51 for (Node* node = m_firstNode.get(); node && node != m_nodeAfterLast; node =
NodeTraversal::next(*node)) { | 51 for (Node* node = m_firstNode.get(); node && node != m_nodeAfterLast; node =
NodeTraversal::next(*node)) { |
| 52 if (node->hasChildren() || (node->isTextNode() && node->nextSibling())) | 52 if (node->hasChildren() || (node->isTextNode() && node->nextSibling())) |
| 53 continue; | 53 continue; |
| 54 | 54 |
| 55 ContainerNode* startingNode = node->parentNode(); | 55 ContainerNode* startingNode = node->parentNode(); |
| 56 if (!startingNode) | 56 if (!startingNode) |
| 57 continue; | 57 continue; |
| 58 RenderStyle* startingStyle = startingNode->renderStyle(); | 58 const RenderStyle* startingStyle = startingNode->renderStyle(); |
| 59 if (!startingStyle) | 59 if (!startingStyle) |
| 60 continue; | 60 continue; |
| 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) |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } | 122 } |
| 123 | 123 |
| 124 void SimplifyMarkupCommand::trace(Visitor* visitor) | 124 void SimplifyMarkupCommand::trace(Visitor* visitor) |
| 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 |