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 11 matching lines...) Expand all Loading... |
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
24 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 */ | 27 */ |
28 | 28 |
29 #include "config.h" | 29 #include "config.h" |
30 #include "core/editing/markup.h" | 30 #include "core/editing/markup.h" |
31 | 31 |
32 #include "CSSPropertyNames.h" | |
33 #include "CSSValueKeywords.h" | |
34 #include "HTMLNames.h" | |
35 #include "bindings/v8/ExceptionState.h" | 32 #include "bindings/v8/ExceptionState.h" |
| 33 #include "core/CSSPropertyNames.h" |
| 34 #include "core/CSSValueKeywords.h" |
| 35 #include "core/HTMLNames.h" |
36 #include "core/css/CSSPrimitiveValue.h" | 36 #include "core/css/CSSPrimitiveValue.h" |
37 #include "core/css/CSSValue.h" | 37 #include "core/css/CSSValue.h" |
38 #include "core/css/StylePropertySet.h" | 38 #include "core/css/StylePropertySet.h" |
39 #include "core/dom/CDATASection.h" | 39 #include "core/dom/CDATASection.h" |
40 #include "core/dom/ChildListMutationScope.h" | 40 #include "core/dom/ChildListMutationScope.h" |
41 #include "core/dom/ContextFeatures.h" | 41 #include "core/dom/ContextFeatures.h" |
42 #include "core/dom/DocumentFragment.h" | 42 #include "core/dom/DocumentFragment.h" |
43 #include "core/dom/ElementTraversal.h" | 43 #include "core/dom/ElementTraversal.h" |
44 #include "core/dom/ExceptionCode.h" | 44 #include "core/dom/ExceptionCode.h" |
45 #include "core/dom/NodeTraversal.h" | 45 #include "core/dom/NodeTraversal.h" |
(...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1077 return; | 1077 return; |
1078 | 1078 |
1079 RefPtrWillBeRawPtr<Text> textNode = toText(node.get()); | 1079 RefPtrWillBeRawPtr<Text> textNode = toText(node.get()); |
1080 RefPtrWillBeRawPtr<Text> textNext = toText(next); | 1080 RefPtrWillBeRawPtr<Text> textNext = toText(next); |
1081 textNode->appendData(textNext->data()); | 1081 textNode->appendData(textNext->data()); |
1082 if (textNext->parentNode()) // Might have been removed by mutation event. | 1082 if (textNext->parentNode()) // Might have been removed by mutation event. |
1083 textNext->remove(exceptionState); | 1083 textNext->remove(exceptionState); |
1084 } | 1084 } |
1085 | 1085 |
1086 } | 1086 } |
OLD | NEW |