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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 23874019: Web Animations CSS: Start running animations on the compositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and rename hasActiveAnimationOnCompositor to hasActiveAnimationsOnCompositor Created 7 years, 1 month 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/dom/Document.h ('k') | Source/core/dom/Element.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 1753 matching lines...) Expand 10 before | Expand all | Expand 10 after
1764 void Document::updateStyleIfNeeded() 1764 void Document::updateStyleIfNeeded()
1765 { 1765 {
1766 ASSERT(isMainThread()); 1766 ASSERT(isMainThread());
1767 ASSERT(!view() || (!view()->isInLayout() && !view()->isPainting())); 1767 ASSERT(!view() || (!view()->isInLayout() && !view()->isPainting()));
1768 1768
1769 if (!needsStyleRecalc() && !childNeedsStyleRecalc() && !childNeedsDistributi onRecalc()) 1769 if (!needsStyleRecalc() && !childNeedsStyleRecalc() && !childNeedsDistributi onRecalc())
1770 return; 1770 return;
1771 1771
1772 AnimationUpdateBlock animationUpdateBlock(m_frame ? &m_frame->animation() : 0); 1772 AnimationUpdateBlock animationUpdateBlock(m_frame ? &m_frame->animation() : 0);
1773 recalcStyle(NoChange); 1773 recalcStyle(NoChange);
1774
1775 if (RuntimeEnabledFeatures::webAnimationsEnabled())
1776 cssPendingAnimations().startPendingAnimations();
1774 m_animationClock->unfreeze(); 1777 m_animationClock->unfreeze();
1775 } 1778 }
1776 1779
1777 void Document::updateStyleForNodeIfNeeded(Node* node) 1780 void Document::updateStyleForNodeIfNeeded(Node* node)
1778 { 1781 {
1779 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc()) 1782 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc())
1780 return; 1783 return;
1781 1784
1782 bool needsStyleRecalc = hasPendingForcedStyleRecalc(); 1785 bool needsStyleRecalc = hasPendingForcedStyleRecalc();
1783 for (Node* ancestor = node; ancestor && !needsStyleRecalc; ancestor = ancest or->parentOrShadowHostNode()) 1786 for (Node* ancestor = node; ancestor && !needsStyleRecalc; ancestor = ancest or->parentOrShadowHostNode())
(...skipping 3425 matching lines...) Expand 10 before | Expand all | Expand 10 after
5209 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode) 5212 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode)
5210 { 5213 {
5211 if (!isActive()) 5214 if (!isActive())
5212 return; 5215 return;
5213 5216
5214 styleEngine()->modifiedStyleSheet(sheet); 5217 styleEngine()->modifiedStyleSheet(sheet);
5215 styleResolverChanged(when, updateMode); 5218 styleResolverChanged(when, updateMode);
5216 } 5219 }
5217 5220
5218 } // namespace WebCore 5221 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698