OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2005, 2006, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2008, 2009 Apple 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 12 matching lines...) Expand all Loading... |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "core/editing/ApplyStyleCommand.h" | 27 #include "core/editing/ApplyStyleCommand.h" |
28 | 28 |
29 #include "CSSPropertyNames.h" | 29 #include "CSSPropertyNames.h" |
30 #include "CSSValueKeywords.h" | 30 #include "CSSValueKeywords.h" |
31 #include "HTMLNames.h" | 31 #include "HTMLNames.h" |
32 #include "core/css/CSSComputedStyleDeclaration.h" | 32 #include "core/css/CSSComputedStyleDeclaration.h" |
33 #include "core/css/CSSParser.h" | |
34 #include "core/css/CSSValuePool.h" | 33 #include "core/css/CSSValuePool.h" |
35 #include "core/css/StylePropertySet.h" | 34 #include "core/css/StylePropertySet.h" |
36 #include "core/css/resolver/StyleResolver.h" | |
37 #include "core/dom/Document.h" | 35 #include "core/dom/Document.h" |
38 #include "core/dom/NodeList.h" | 36 #include "core/dom/NodeList.h" |
39 #include "core/dom/NodeTraversal.h" | 37 #include "core/dom/NodeTraversal.h" |
40 #include "core/dom/Range.h" | 38 #include "core/dom/Range.h" |
41 #include "core/dom/Text.h" | 39 #include "core/dom/Text.h" |
42 #include "core/editing/EditingStyle.h" | 40 #include "core/editing/EditingStyle.h" |
43 #include "core/editing/Editor.h" | |
44 #include "core/editing/HTMLInterchange.h" | 41 #include "core/editing/HTMLInterchange.h" |
45 #include "core/editing/TextIterator.h" | 42 #include "core/editing/TextIterator.h" |
46 #include "core/editing/VisibleUnits.h" | 43 #include "core/editing/VisibleUnits.h" |
47 #include "core/editing/htmlediting.h" | 44 #include "core/editing/htmlediting.h" |
48 #include "core/html/HTMLFontElement.h" | |
49 #include "core/page/Frame.h" | |
50 #include "core/rendering/RenderObject.h" | 45 #include "core/rendering/RenderObject.h" |
51 #include "core/rendering/RenderText.h" | 46 #include "core/rendering/RenderText.h" |
52 #include <wtf/StdLibExtras.h> | 47 #include <wtf/StdLibExtras.h> |
53 #include <wtf/text/StringBuilder.h> | 48 #include <wtf/text/StringBuilder.h> |
54 | 49 |
55 namespace WebCore { | 50 namespace WebCore { |
56 | 51 |
57 using namespace HTMLNames; | 52 using namespace HTMLNames; |
58 | 53 |
59 static String& styleSpanClassString() | 54 static String& styleSpanClassString() |
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1547 String textToMove = nextText->data(); | 1542 String textToMove = nextText->data(); |
1548 insertTextIntoNode(childText, childText->length(), textToMove); | 1543 insertTextIntoNode(childText, childText->length(), textToMove); |
1549 removeNode(next); | 1544 removeNode(next); |
1550 // don't move child node pointer. it may want to merge with more text no
des. | 1545 // don't move child node pointer. it may want to merge with more text no
des. |
1551 } | 1546 } |
1552 | 1547 |
1553 updateStartEnd(newStart, newEnd); | 1548 updateStartEnd(newStart, newEnd); |
1554 } | 1549 } |
1555 | 1550 |
1556 } | 1551 } |
OLD | NEW |