| 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 static inline HTMLElement* ancestorToRetainStructureAndAppearanceWithNoLayoutObj
ect(Node* commonAncestor) | 155 static inline HTMLElement* ancestorToRetainStructureAndAppearanceWithNoLayoutObj
ect(Node* commonAncestor) |
| 156 { | 156 { |
| 157 HTMLElement* commonAncestorBlock = toHTMLElement(enclosingNodeOfType(firstPo
sitionInOrBeforeNode(commonAncestor), isHTMLBlockElement)); | 157 HTMLElement* commonAncestorBlock = toHTMLElement(enclosingNodeOfType(firstPo
sitionInOrBeforeNode(commonAncestor), isHTMLBlockElement)); |
| 158 return ancestorToRetainStructureAndAppearanceForBlock(commonAncestorBlock); | 158 return ancestorToRetainStructureAndAppearanceForBlock(commonAncestorBlock); |
| 159 } | 159 } |
| 160 | 160 |
| 161 bool propertyMissingOrEqualToNone(StylePropertySet* style, CSSPropertyID propert
yID) | 161 bool propertyMissingOrEqualToNone(StylePropertySet* style, CSSPropertyID propert
yID) |
| 162 { | 162 { |
| 163 if (!style) | 163 if (!style) |
| 164 return false; | 164 return false; |
| 165 RefPtrWillBeRawPtr<CSSValue> value = style->getPropertyCSSValue(propertyID); | 165 NullableCSSValue value = style->getPropertyCSSValue(propertyID); |
| 166 if (!value) | 166 if (!value) |
| 167 return true; | 167 return true; |
| 168 if (!value->isPrimitiveValue()) | 168 if (!value->isPrimitiveValue()) |
| 169 return false; | 169 return false; |
| 170 return toCSSPrimitiveValue(value.get())->getValueID() == CSSValueNone; | 170 return toCSSPrimitiveValue(value)->getValueID() == CSSValueNone; |
| 171 } | 171 } |
| 172 | 172 |
| 173 static bool isPresentationalHTMLElement(const Node* node) | 173 static bool isPresentationalHTMLElement(const Node* node) |
| 174 { | 174 { |
| 175 if (!node->isHTMLElement()) | 175 if (!node->isHTMLElement()) |
| 176 return false; | 176 return false; |
| 177 | 177 |
| 178 const HTMLElement& element = toHTMLElement(*node); | 178 const HTMLElement& element = toHTMLElement(*node); |
| 179 return element.hasTagName(uTag) || element.hasTagName(sTag) || element.hasTa
gName(strikeTag) | 179 return element.hasTagName(uTag) || element.hasTagName(sTag) || element.hasTa
gName(strikeTag) |
| 180 || element.hasTagName(iTag) || element.hasTagName(emTag) || element.hasT
agName(bTag) || element.hasTagName(strongTag); | 180 || element.hasTagName(iTag) || element.hasTagName(emTag) || element.hasT
agName(bTag) || element.hasTagName(strongTag); |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 RefPtrWillBeRawPtr<Text> textNext = toText(next); | 719 RefPtrWillBeRawPtr<Text> textNext = toText(next); |
| 720 textNode->appendData(textNext->data()); | 720 textNode->appendData(textNext->data()); |
| 721 if (textNext->parentNode()) // Might have been removed by mutation event. | 721 if (textNext->parentNode()) // Might have been removed by mutation event. |
| 722 textNext->remove(exceptionState); | 722 textNext->remove(exceptionState); |
| 723 } | 723 } |
| 724 | 724 |
| 725 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingStrategy>; | 725 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingStrategy>; |
| 726 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingInComposedTreeS
trategy>; | 726 template class CORE_TEMPLATE_EXPORT CreateMarkupAlgorithm<EditingInComposedTreeS
trategy>; |
| 727 | 727 |
| 728 } | 728 } |
| OLD | NEW |