| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc. | 2 * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc. |
| 3 * Copyright (C) 2010, 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2010, 2011 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "core/editing/EditingStyle.h" | 28 #include "core/editing/EditingStyle.h" |
| 29 | 29 |
| 30 #include "HTMLNames.h" | 30 #include "HTMLNames.h" |
| 31 #include "bindings/v8/ExceptionStatePlaceholder.h" | 31 #include "bindings/v8/ExceptionStatePlaceholder.h" |
| 32 #include "core/css/CSSComputedStyleDeclaration.h" | 32 #include "core/css/CSSComputedStyleDeclaration.h" |
| 33 #include "core/css/CSSParser.h" | 33 #include "core/css/CSSParser.h" |
| 34 #include "core/css/CSSRuleList.h" | 34 #include "core/css/CSSRuleList.h" |
| 35 #include "core/css/CSSStyleRule.h" | 35 #include "core/css/CSSStyleRule.h" |
| 36 #include "core/css/CSSValueList.h" | 36 #include "core/css/CSSValueList.h" |
| 37 #include "core/css/FontSize.h" | 37 #include "core/css/FontSize.h" |
| 38 #include "core/css/RuntimeCSSEnabled.h" |
| 38 #include "core/css/StylePropertySet.h" | 39 #include "core/css/StylePropertySet.h" |
| 39 #include "core/css/StyleRule.h" | 40 #include "core/css/StyleRule.h" |
| 40 #include "core/css/resolver/StyleResolver.h" | 41 #include "core/css/resolver/StyleResolver.h" |
| 41 #include "core/dom/Element.h" | 42 #include "core/dom/Element.h" |
| 42 #include "core/dom/Node.h" | 43 #include "core/dom/Node.h" |
| 43 #include "core/dom/NodeTraversal.h" | 44 #include "core/dom/NodeTraversal.h" |
| 44 #include "core/dom/Position.h" | 45 #include "core/dom/Position.h" |
| 45 #include "core/dom/QualifiedName.h" | 46 #include "core/dom/QualifiedName.h" |
| 46 #include "core/editing/ApplyStyleCommand.h" | 47 #include "core/editing/ApplyStyleCommand.h" |
| 47 #include "core/editing/Editor.h" | 48 #include "core/editing/Editor.h" |
| 48 #include "core/editing/FrameSelection.h" | 49 #include "core/editing/FrameSelection.h" |
| 49 #include "core/editing/HTMLInterchange.h" | 50 #include "core/editing/HTMLInterchange.h" |
| 50 #include "core/editing/htmlediting.h" | 51 #include "core/editing/htmlediting.h" |
| 52 #include "core/frame/Frame.h" |
| 51 #include "core/html/HTMLFontElement.h" | 53 #include "core/html/HTMLFontElement.h" |
| 52 #include "core/frame/Frame.h" | |
| 53 #include "core/page/RuntimeCSSEnabled.h" | |
| 54 #include "core/rendering/style/RenderStyle.h" | 54 #include "core/rendering/style/RenderStyle.h" |
| 55 | 55 |
| 56 namespace WebCore { | 56 namespace WebCore { |
| 57 | 57 |
| 58 static const CSSPropertyID& textDecorationPropertyForEditing() | 58 static const CSSPropertyID& textDecorationPropertyForEditing() |
| 59 { | 59 { |
| 60 static const CSSPropertyID property = RuntimeEnabledFeatures::css3TextDecora
tionsEnabled() ? CSSPropertyTextDecorationLine : CSSPropertyTextDecoration; | 60 static const CSSPropertyID property = RuntimeEnabledFeatures::css3TextDecora
tionsEnabled() ? CSSPropertyTextDecorationLine : CSSPropertyTextDecoration; |
| 61 return property; | 61 return property; |
| 62 } | 62 } |
| 63 | 63 |
| (...skipping 1585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1649 { | 1649 { |
| 1650 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) { | 1650 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) { |
| 1651 RefPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSComputedStyleDecl
aration::create(ancestor); | 1651 RefPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSComputedStyleDecl
aration::create(ancestor); |
| 1652 if (!hasTransparentBackgroundColor(ancestorStyle.get())) | 1652 if (!hasTransparentBackgroundColor(ancestorStyle.get())) |
| 1653 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor
); | 1653 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor
); |
| 1654 } | 1654 } |
| 1655 return 0; | 1655 return 0; |
| 1656 } | 1656 } |
| 1657 | 1657 |
| 1658 } | 1658 } |
| OLD | NEW |