| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 } | 109 } |
| 110 return properties; | 110 return properties; |
| 111 } | 111 } |
| 112 | 112 |
| 113 static const Vector<CSSPropertyID>& inheritableEditingProperties() | 113 static const Vector<CSSPropertyID>& inheritableEditingProperties() |
| 114 { | 114 { |
| 115 DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ()); | 115 DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ()); |
| 116 if (properties.isEmpty()) { | 116 if (properties.isEmpty()) { |
| 117 RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticEditingPro
perties, WTF_ARRAY_LENGTH(staticEditingProperties), properties); | 117 RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticEditingPro
perties, WTF_ARRAY_LENGTH(staticEditingProperties), properties); |
| 118 for (size_t index = 0; index < properties.size();) { | 118 for (size_t index = 0; index < properties.size();) { |
| 119 if (!CSSProperty::isInheritedProperty(properties[index])) { | 119 if (!CSSPropertyMetadata::isInheritedProperty(properties[index])) { |
| 120 properties.remove(index); | 120 properties.remove(index); |
| 121 continue; | 121 continue; |
| 122 } | 122 } |
| 123 ++index; | 123 ++index; |
| 124 } | 124 } |
| 125 } | 125 } |
| 126 return properties; | 126 return properties; |
| 127 } | 127 } |
| 128 | 128 |
| 129 template <class StyleDeclarationType> | 129 template <class StyleDeclarationType> |
| (...skipping 1548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1678 { | 1678 { |
| 1679 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) { | 1679 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) { |
| 1680 RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSCompu
tedStyleDeclaration::create(ancestor); | 1680 RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSCompu
tedStyleDeclaration::create(ancestor); |
| 1681 if (!hasTransparentBackgroundColor(ancestorStyle.get())) | 1681 if (!hasTransparentBackgroundColor(ancestorStyle.get())) |
| 1682 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor
); | 1682 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor
); |
| 1683 } | 1683 } |
| 1684 return nullptr; | 1684 return nullptr; |
| 1685 } | 1685 } |
| 1686 | 1686 |
| 1687 } | 1687 } |
| OLD | NEW |