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

Side by Side Diff: sky/engine/core/css/CSSComputedStyleDeclaration.cpp

Issue 772673002: Fix Animations, Remove Compostior Animations. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: CompositorPendingAnimations -> PendingAnimations Created 6 years 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
« no previous file with comments | « sky/engine/core/core.gni ('k') | sky/engine/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 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert yID propertyID, EUpdateLayout updateLayout) const 1272 PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert yID propertyID, EUpdateLayout updateLayout) const
1273 { 1273 {
1274 if (!m_node) 1274 if (!m_node)
1275 return nullptr; 1275 return nullptr;
1276 RenderObject* renderer = m_node->renderer(); 1276 RenderObject* renderer = m_node->renderer();
1277 RefPtr<RenderStyle> style; 1277 RefPtr<RenderStyle> style;
1278 1278
1279 if (updateLayout) { 1279 if (updateLayout) {
1280 Document& document = m_node->document(); 1280 Document& document = m_node->document();
1281 1281
1282 // A timing update may be required if a compositor animation is running.
1283 DocumentAnimations::updateAnimationTimingForGetComputedStyle(*m_node, pr opertyID);
1284
1285 document.updateRenderTreeForNodeIfNeeded(m_node.get()); 1282 document.updateRenderTreeForNodeIfNeeded(m_node.get());
1286 renderer = m_node->renderer(); 1283 renderer = m_node->renderer();
1287 1284
1288 style = computeRenderStyle(propertyID); 1285 style = computeRenderStyle(propertyID);
1289 1286
1290 bool forceFullLayout = isLayoutDependent(propertyID, style, renderer) || m_node->isInShadowTree(); 1287 bool forceFullLayout = isLayoutDependent(propertyID, style, renderer) || m_node->isInShadowTree();
1291 1288
1292 if (forceFullLayout) { 1289 if (forceFullLayout) {
1293 document.updateLayoutIgnorePendingStylesheets(); 1290 document.updateLayoutIgnorePendingStylesheets();
1294 style = computeRenderStyle(propertyID); 1291 style = computeRenderStyle(propertyID);
(...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after
2437 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2434 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2438 CSSPropertyB ackgroundClip }; 2435 CSSPropertyB ackgroundClip };
2439 2436
2440 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2437 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2441 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 2438 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
2442 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 2439 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
2443 return list.release(); 2440 return list.release();
2444 } 2441 }
2445 2442
2446 } // namespace blink 2443 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/core.gni ('k') | sky/engine/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698