| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #include "core/editing/VisibleSelection.h" | 51 #include "core/editing/VisibleSelection.h" |
| 52 #include "core/editing/VisibleUnits.h" | 52 #include "core/editing/VisibleUnits.h" |
| 53 #include "core/editing/htmlediting.h" | 53 #include "core/editing/htmlediting.h" |
| 54 #include "core/html/HTMLBodyElement.h" | 54 #include "core/html/HTMLBodyElement.h" |
| 55 #include "core/html/HTMLElement.h" | 55 #include "core/html/HTMLElement.h" |
| 56 #include "core/html/HTMLHtmlElement.h" | 56 #include "core/html/HTMLHtmlElement.h" |
| 57 #include "core/html/HTMLTableElement.h" | 57 #include "core/html/HTMLTableElement.h" |
| 58 #include "core/html/HTMLTextFormControlElement.h" | 58 #include "core/html/HTMLTextFormControlElement.h" |
| 59 #include "core/frame/Frame.h" | 59 #include "core/frame/Frame.h" |
| 60 #include "core/rendering/RenderObject.h" | 60 #include "core/rendering/RenderObject.h" |
| 61 #include "weborigin/KURL.h" | 61 #include "platform/weborigin/KURL.h" |
| 62 #include "wtf/StdLibExtras.h" | 62 #include "wtf/StdLibExtras.h" |
| 63 #include "wtf/text/StringBuilder.h" | 63 #include "wtf/text/StringBuilder.h" |
| 64 | 64 |
| 65 using namespace std; | 65 using namespace std; |
| 66 | 66 |
| 67 namespace WebCore { | 67 namespace WebCore { |
| 68 | 68 |
| 69 using namespace HTMLNames; | 69 using namespace HTMLNames; |
| 70 | 70 |
| 71 static bool propertyMissingOrEqualToNone(StylePropertySet*, CSSPropertyID); | 71 static bool propertyMissingOrEqualToNone(StylePropertySet*, CSSPropertyID); |
| (...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1083 return; | 1083 return; |
| 1084 | 1084 |
| 1085 RefPtr<Text> textNode = toText(node.get()); | 1085 RefPtr<Text> textNode = toText(node.get()); |
| 1086 RefPtr<Text> textNext = toText(next); | 1086 RefPtr<Text> textNext = toText(next); |
| 1087 textNode->appendData(textNext->data()); | 1087 textNode->appendData(textNext->data()); |
| 1088 if (textNext->parentNode()) // Might have been removed by mutation event. | 1088 if (textNext->parentNode()) // Might have been removed by mutation event. |
| 1089 textNext->remove(es); | 1089 textNext->remove(es); |
| 1090 } | 1090 } |
| 1091 | 1091 |
| 1092 } | 1092 } |
| OLD | NEW |