| 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 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1068 | 1068 |
| 1069 if (containerNode->hasOneChild()) { | 1069 if (containerNode->hasOneChild()) { |
| 1070 containerNode->replaceChild(textNode.release(), containerNode->firstChil
d(), es); | 1070 containerNode->replaceChild(textNode.release(), containerNode->firstChil
d(), es); |
| 1071 return; | 1071 return; |
| 1072 } | 1072 } |
| 1073 | 1073 |
| 1074 containerNode->removeChildren(); | 1074 containerNode->removeChildren(); |
| 1075 containerNode->appendChild(textNode.release(), es); | 1075 containerNode->appendChild(textNode.release(), es); |
| 1076 } | 1076 } |
| 1077 | 1077 |
| 1078 void mergeWithNextTextNode(PassRefPtr<Node> node, ExceptionState& es) | |
| 1079 { | |
| 1080 ASSERT(node && node->isTextNode()); | |
| 1081 Node* next = node->nextSibling(); | |
| 1082 if (!next || !next->isTextNode()) | |
| 1083 return; | |
| 1084 | |
| 1085 RefPtr<Text> textNode = toText(node.get()); | |
| 1086 RefPtr<Text> textNext = toText(next); | |
| 1087 textNode->appendData(textNext->data()); | |
| 1088 if (textNext->parentNode()) // Might have been removed by mutation event. | |
| 1089 textNext->remove(es); | |
| 1090 } | 1078 } |
| 1091 | |
| 1092 } | |
| OLD | NEW |