Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: path for re-landing try #2 with removed unnecessary comment Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/inspector/InspectorLayerTreeAgent.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1598 matching lines...) Expand 10 before | Expand all | Expand 10 after
1609 default: 1609 default:
1610 return false; 1610 return false;
1611 } 1611 }
1612 } 1612 }
1613 1613
1614 PassRefPtr<RenderStyle> CSSComputedStyleDeclaration::computeRenderStyle(CSSPrope rtyID propertyID) const 1614 PassRefPtr<RenderStyle> CSSComputedStyleDeclaration::computeRenderStyle(CSSPrope rtyID propertyID) const
1615 { 1615 {
1616 Node* styledNode = this->styledNode(); 1616 Node* styledNode = this->styledNode();
1617 ASSERT(styledNode); 1617 ASSERT(styledNode);
1618 RenderObject* renderer = styledNode->renderer(); 1618 RenderObject* renderer = styledNode->renderer();
1619 if (renderer && renderer->isComposited() && !RuntimeEnabledFeatures::webAnim ationsCSSEnabled() && AnimationController::supportsAcceleratedAnimationOfPropert y(propertyID)) { 1619 if (renderer && renderer->compositingState() == PaintsIntoOwnBacking
1620 && !RuntimeEnabledFeatures::webAnimationsCSSEnabled() && AnimationContro ller::supportsAcceleratedAnimationOfProperty(propertyID)) {
1620 AnimationUpdateBlock animationUpdateBlock(renderer->animation()); 1621 AnimationUpdateBlock animationUpdateBlock(renderer->animation());
1621 if (m_pseudoElementSpecifier && !styledNode->isPseudoElement()) { 1622 if (m_pseudoElementSpecifier && !styledNode->isPseudoElement()) {
1622 // FIXME: This cached pseudo style will only exist if the animation has been run at least once. 1623 // FIXME: This cached pseudo style will only exist if the animation has been run at least once.
1623 return renderer->animation()->getAnimatedStyleForRenderer(renderer)- >getCachedPseudoStyle(m_pseudoElementSpecifier); 1624 return renderer->animation()->getAnimatedStyleForRenderer(renderer)- >getCachedPseudoStyle(m_pseudoElementSpecifier);
1624 } 1625 }
1625 return renderer->animation()->getAnimatedStyleForRenderer(renderer); 1626 return renderer->animation()->getAnimatedStyleForRenderer(renderer);
1626 } 1627 }
1627 return styledNode->computedStyle(styledNode->isPseudoElement() ? NOPSEUDO : m_pseudoElementSpecifier); 1628 return styledNode->computedStyle(styledNode->isPseudoElement() ? NOPSEUDO : m_pseudoElementSpecifier);
1628 } 1629 }
1629 1630
(...skipping 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after
3233 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3234 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3234 CSSPropertyB ackgroundClip }; 3235 CSSPropertyB ackgroundClip };
3235 3236
3236 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3237 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3237 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3238 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3238 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3239 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3239 return list.release(); 3240 return list.release();
3240 } 3241 }
3241 3242
3242 } // namespace WebCore 3243 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/inspector/InspectorLayerTreeAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698