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

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

Issue 211773002: Rename updateStyle to updateRenderTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix tracing test Created 6 years, 9 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 | « Source/core/animation/EffectInput.cpp ('k') | Source/core/dom/Document.h » ('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 1545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1556 RenderObject* renderer = styledNode->renderer(); 1556 RenderObject* renderer = styledNode->renderer();
1557 RefPtr<RenderStyle> style; 1557 RefPtr<RenderStyle> style;
1558 1558
1559 if (updateLayout) { 1559 if (updateLayout) {
1560 Document& document = styledNode->document(); 1560 Document& document = styledNode->document();
1561 1561
1562 // A timing update may be required if a compositor animation is running or animations 1562 // A timing update may be required if a compositor animation is running or animations
1563 // have been updated via the api. 1563 // have been updated via the api.
1564 DocumentAnimations::updateAnimationTimingForGetComputedStyle(*styledNode , propertyID); 1564 DocumentAnimations::updateAnimationTimingForGetComputedStyle(*styledNode , propertyID);
1565 1565
1566 document.updateStyleForNodeIfNeeded(styledNode); 1566 document.updateRenderTreeForNodeIfNeeded(styledNode);
1567 1567
1568 // The style recalc could have caused the styled node to be discarded or replaced 1568 // The style recalc could have caused the styled node to be discarded or replaced
1569 // if it was a PseudoElement so we need to update it. 1569 // if it was a PseudoElement so we need to update it.
1570 styledNode = this->styledNode(); 1570 styledNode = this->styledNode();
1571 renderer = styledNode->renderer(); 1571 renderer = styledNode->renderer();
1572 1572
1573 style = computeRenderStyle(propertyID); 1573 style = computeRenderStyle(propertyID);
1574 1574
1575 bool forceFullLayout = isLayoutDependent(propertyID, style, renderer) 1575 bool forceFullLayout = isLayoutDependent(propertyID, style, renderer)
1576 || styledNode->isInShadowTree() 1576 || styledNode->isInShadowTree()
(...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after
3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3043 CSSPropertyB ackgroundClip }; 3043 CSSPropertyB ackgroundClip };
3044 3044
3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3048 return list.release(); 3048 return list.release();
3049 } 3049 }
3050 3050
3051 } // namespace WebCore 3051 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/EffectInput.cpp ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698