| 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 19 matching lines...) Expand all Loading... |
| 30 #include "core/HTMLNames.h" | 30 #include "core/HTMLNames.h" |
| 31 #include "core/css/CSSComputedStyleDeclaration.h" | 31 #include "core/css/CSSComputedStyleDeclaration.h" |
| 32 #include "core/css/CSSPrimitiveValue.h" | 32 #include "core/css/CSSPrimitiveValue.h" |
| 33 #include "core/css/StylePropertySet.h" | 33 #include "core/css/StylePropertySet.h" |
| 34 #include "core/dom/Document.h" | 34 #include "core/dom/Document.h" |
| 35 #include "core/dom/NodeList.h" | 35 #include "core/dom/NodeList.h" |
| 36 #include "core/dom/NodeTraversal.h" | 36 #include "core/dom/NodeTraversal.h" |
| 37 #include "core/dom/Range.h" | 37 #include "core/dom/Range.h" |
| 38 #include "core/dom/Text.h" | 38 #include "core/dom/Text.h" |
| 39 #include "core/editing/EditingStyle.h" | 39 #include "core/editing/EditingStyle.h" |
| 40 #include "core/editing/EditingStyleUtilities.h" |
| 40 #include "core/editing/EditingUtilities.h" | 41 #include "core/editing/EditingUtilities.h" |
| 41 #include "core/editing/PlainTextRange.h" | 42 #include "core/editing/PlainTextRange.h" |
| 42 #include "core/editing/VisibleUnits.h" | 43 #include "core/editing/VisibleUnits.h" |
| 43 #include "core/editing/iterators/TextIterator.h" | 44 #include "core/editing/iterators/TextIterator.h" |
| 44 #include "core/editing/serializers/HTMLInterchange.h" | 45 #include "core/editing/serializers/HTMLInterchange.h" |
| 45 #include "core/frame/UseCounter.h" | 46 #include "core/frame/UseCounter.h" |
| 46 #include "core/html/HTMLFontElement.h" | 47 #include "core/html/HTMLFontElement.h" |
| 47 #include "core/html/HTMLSpanElement.h" | 48 #include "core/html/HTMLSpanElement.h" |
| 48 #include "core/layout/LayoutObject.h" | 49 #include "core/layout/LayoutObject.h" |
| 49 #include "core/layout/LayoutText.h" | 50 #include "core/layout/LayoutText.h" |
| (...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 return; | 650 return; |
| 650 } | 651 } |
| 651 } | 652 } |
| 652 } | 653 } |
| 653 } | 654 } |
| 654 | 655 |
| 655 static HTMLElement* highestEmbeddingAncestor(Node* startNode, | 656 static HTMLElement* highestEmbeddingAncestor(Node* startNode, |
| 656 Node* enclosingNode) { | 657 Node* enclosingNode) { |
| 657 for (Node* n = startNode; n && n != enclosingNode; n = n->parentNode()) { | 658 for (Node* n = startNode; n && n != enclosingNode; n = n->parentNode()) { |
| 658 if (n->isHTMLElement() && | 659 if (n->isHTMLElement() && |
| 659 EditingStyle::isEmbedOrIsolate(getIdentifierValue( | 660 EditingStyleUtilities::isEmbedOrIsolate(getIdentifierValue( |
| 660 CSSComputedStyleDeclaration::create(n), CSSPropertyUnicodeBidi))) { | 661 CSSComputedStyleDeclaration::create(n), CSSPropertyUnicodeBidi))) { |
| 661 return toHTMLElement(n); | 662 return toHTMLElement(n); |
| 662 } | 663 } |
| 663 } | 664 } |
| 664 | 665 |
| 665 return 0; | 666 return 0; |
| 666 } | 667 } |
| 667 | 668 |
| 668 void ApplyStyleCommand::applyInlineStyle(EditingStyle* style, | 669 void ApplyStyleCommand::applyInlineStyle(EditingStyle* style, |
| 669 EditingState* editingState) { | 670 EditingState* editingState) { |
| (...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2029 | 2030 |
| 2030 DEFINE_TRACE(ApplyStyleCommand) { | 2031 DEFINE_TRACE(ApplyStyleCommand) { |
| 2031 visitor->trace(m_style); | 2032 visitor->trace(m_style); |
| 2032 visitor->trace(m_start); | 2033 visitor->trace(m_start); |
| 2033 visitor->trace(m_end); | 2034 visitor->trace(m_end); |
| 2034 visitor->trace(m_styledInlineElement); | 2035 visitor->trace(m_styledInlineElement); |
| 2035 CompositeEditCommand::trace(visitor); | 2036 CompositeEditCommand::trace(visitor); |
| 2036 } | 2037 } |
| 2037 | 2038 |
| 2038 } // namespace blink | 2039 } // namespace blink |
| OLD | NEW |