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

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

Issue 135693003: Defer starting of animations until after compositing update (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove anonymous namespace. Created 6 years, 10 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
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 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after
1527 if (!styledNode) 1527 if (!styledNode)
1528 return nullptr; 1528 return nullptr;
1529 RenderObject* renderer = styledNode->renderer(); 1529 RenderObject* renderer = styledNode->renderer();
1530 RefPtr<RenderStyle> style; 1530 RefPtr<RenderStyle> style;
1531 1531
1532 if (updateLayout) { 1532 if (updateLayout) {
1533 Document& document = styledNode->document(); 1533 Document& document = styledNode->document();
1534 1534
1535 // If a compositor animation is running or animations have been updated 1535 // If a compositor animation is running or animations have been updated
1536 // via the api we may need to service animations in order to generate 1536 // via the api we may need to service animations in order to generate
1537 // an up to date value. 1537 // an up to date value.
abarth-chromium 2014/02/24 06:14:08 This comment seems slightly out of date now.
dstockwell 2014/02/24 12:41:16 Done.
1538 DocumentAnimations::serviceBeforeGetComputedStyle(*styledNode, propertyI D); 1538 DocumentAnimations::updateAnimationTimingForGetComputedStyle(*styledNode , propertyID);
1539 1539
1540 document.updateStyleForNodeIfNeeded(styledNode); 1540 document.updateStyleForNodeIfNeeded(styledNode);
1541 1541
1542 // The style recalc could have caused the styled node to be discarded or replaced 1542 // The style recalc could have caused the styled node to be discarded or replaced
1543 // if it was a PseudoElement so we need to update it. 1543 // if it was a PseudoElement so we need to update it.
1544 styledNode = this->styledNode(); 1544 styledNode = this->styledNode();
1545 renderer = styledNode->renderer(); 1545 renderer = styledNode->renderer();
1546 1546
1547 style = computeRenderStyle(propertyID); 1547 style = computeRenderStyle(propertyID);
1548 1548
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
3035 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3035 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3036 CSSPropertyB ackgroundClip }; 3036 CSSPropertyB ackgroundClip };
3037 3037
3038 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3038 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3039 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3039 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3040 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3040 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3041 return list.release(); 3041 return list.release();
3042 } 3042 }
3043 3043
3044 } // namespace WebCore 3044 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698