| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved. |
| 4 * Copyright (C) 2011 Igalia S.L. | 4 * Copyright (C) 2011 Igalia S.L. |
| 5 * Copyright (C) 2011 Motorola Mobility. All rights reserved. | 5 * Copyright (C) 2011 Motorola Mobility. All rights reserved. |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 next = NodeTraversal::nextSkippingChildren(*n); | 362 next = NodeTraversal::nextSkippingChildren(*n); |
| 363 // Don't skip over pastEnd. | 363 // Don't skip over pastEnd. |
| 364 if (pastEnd && pastEnd->isDescendantOf(n)) | 364 if (pastEnd && pastEnd->isDescendantOf(n)) |
| 365 next = pastEnd; | 365 next = pastEnd; |
| 366 } else { | 366 } else { |
| 367 // Add the node to the markup if we're not skipping the descendants | 367 // Add the node to the markup if we're not skipping the descendants |
| 368 if (shouldEmit) | 368 if (shouldEmit) |
| 369 appendStartTag(*n); | 369 appendStartTag(*n); |
| 370 | 370 |
| 371 // If node has no children, close the tag now. | 371 // If node has no children, close the tag now. |
| 372 if (!n->hasChildNodes()) { | 372 if (!n->hasChildren()) { |
| 373 if (shouldEmit) | 373 if (shouldEmit) |
| 374 appendEndTag(*n); | 374 appendEndTag(*n); |
| 375 lastClosed = n; | 375 lastClosed = n; |
| 376 } else { | 376 } else { |
| 377 openedTag = true; | 377 openedTag = true; |
| 378 ancestorsToClose.append(n); | 378 ancestorsToClose.append(n); |
| 379 } | 379 } |
| 380 } | 380 } |
| 381 | 381 |
| 382 // If we didn't insert open tag and there's no more siblings or we're at
the end of the traversal, take care of ancestors. | 382 // If we didn't insert open tag and there's no more siblings or we're at
the end of the traversal, take care of ancestors. |
| (...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1048 return; | 1048 return; |
| 1049 | 1049 |
| 1050 RefPtr<Text> textNode = toText(node.get()); | 1050 RefPtr<Text> textNode = toText(node.get()); |
| 1051 RefPtr<Text> textNext = toText(next); | 1051 RefPtr<Text> textNext = toText(next); |
| 1052 textNode->appendData(textNext->data()); | 1052 textNode->appendData(textNext->data()); |
| 1053 if (textNext->parentNode()) // Might have been removed by mutation event. | 1053 if (textNext->parentNode()) // Might have been removed by mutation event. |
| 1054 textNext->remove(exceptionState); | 1054 textNext->remove(exceptionState); |
| 1055 } | 1055 } |
| 1056 | 1056 |
| 1057 } | 1057 } |
| OLD | NEW |