| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> | 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. | 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Lesser General Public | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 1596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1607 default: | 1607 default: |
| 1608 return false; | 1608 return false; |
| 1609 } | 1609 } |
| 1610 } | 1610 } |
| 1611 | 1611 |
| 1612 PassRefPtr<RenderStyle> CSSComputedStyleDeclaration::computeRenderStyle(CSSPrope
rtyID propertyID) const | 1612 PassRefPtr<RenderStyle> CSSComputedStyleDeclaration::computeRenderStyle(CSSPrope
rtyID propertyID) const |
| 1613 { | 1613 { |
| 1614 Node* styledNode = this->styledNode(); | 1614 Node* styledNode = this->styledNode(); |
| 1615 ASSERT(styledNode); | 1615 ASSERT(styledNode); |
| 1616 RenderObject* renderer = styledNode->renderer(); | 1616 RenderObject* renderer = styledNode->renderer(); |
| 1617 if (renderer && renderer->isComposited() && !RuntimeEnabledFeatures::webAnim
ationsCSSEnabled() && AnimationController::supportsAcceleratedAnimationOfPropert
y(propertyID)) { | 1617 if (renderer && renderer->compositingState() == PaintsIntoOwnBacking |
| 1618 && !RuntimeEnabledFeatures::webAnimationsCSSEnabled() && AnimationContro
ller::supportsAcceleratedAnimationOfProperty(propertyID)) { |
| 1618 AnimationUpdateBlock animationUpdateBlock(renderer->animation()); | 1619 AnimationUpdateBlock animationUpdateBlock(renderer->animation()); |
| 1619 if (m_pseudoElementSpecifier && !styledNode->isPseudoElement()) { | 1620 if (m_pseudoElementSpecifier && !styledNode->isPseudoElement()) { |
| 1620 // FIXME: This cached pseudo style will only exist if the animation
has been run at least once. | 1621 // FIXME: This cached pseudo style will only exist if the animation
has been run at least once. |
| 1621 return renderer->animation()->getAnimatedStyleForRenderer(renderer)-
>getCachedPseudoStyle(m_pseudoElementSpecifier); | 1622 return renderer->animation()->getAnimatedStyleForRenderer(renderer)-
>getCachedPseudoStyle(m_pseudoElementSpecifier); |
| 1622 } | 1623 } |
| 1623 return renderer->animation()->getAnimatedStyleForRenderer(renderer); | 1624 return renderer->animation()->getAnimatedStyleForRenderer(renderer); |
| 1624 } | 1625 } |
| 1625 return styledNode->computedStyle(styledNode->isPseudoElement() ? NOPSEUDO :
m_pseudoElementSpecifier); | 1626 return styledNode->computedStyle(styledNode->isPseudoElement() ? NOPSEUDO :
m_pseudoElementSpecifier); |
| 1626 } | 1627 } |
| 1627 | 1628 |
| (...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3195 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB
ackgroundSize, CSSPropertyBackgroundOrigin, | 3196 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB
ackgroundSize, CSSPropertyBackgroundOrigin, |
| 3196 CSSPropertyB
ackgroundClip }; | 3197 CSSPropertyB
ackgroundClip }; |
| 3197 | 3198 |
| 3198 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); | 3199 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); |
| 3199 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash
Seperator)))); | 3200 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash
Seperator)))); |
| 3200 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe
perator)))); | 3201 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe
perator)))); |
| 3201 return list.release(); | 3202 return list.release(); |
| 3202 } | 3203 } |
| 3203 | 3204 |
| 3204 } // namespace WebCore | 3205 } // namespace WebCore |
| OLD | NEW |