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

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

Issue 33483002: Have Frame::animation() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
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 1742 matching lines...) Expand 10 before | Expand all | Expand 10 after
1753 } 1753 }
1754 1754
1755 void Document::updateStyleIfNeeded() 1755 void Document::updateStyleIfNeeded()
1756 { 1756 {
1757 ASSERT(isMainThread()); 1757 ASSERT(isMainThread());
1758 ASSERT(!view() || (!view()->isInLayout() && !view()->isPainting())); 1758 ASSERT(!view() || (!view()->isInLayout() && !view()->isPainting()));
1759 1759
1760 if (!needsStyleRecalc() && !childNeedsStyleRecalc() && !childNeedsDistributi onRecalc()) 1760 if (!needsStyleRecalc() && !childNeedsStyleRecalc() && !childNeedsDistributi onRecalc())
1761 return; 1761 return;
1762 1762
1763 AnimationUpdateBlock animationUpdateBlock(m_frame ? m_frame->animation() : 0 ); 1763 AnimationUpdateBlock animationUpdateBlock(m_frame ? &m_frame->animation() : 0);
1764 recalcStyle(NoChange); 1764 recalcStyle(NoChange);
1765 } 1765 }
1766 1766
1767 void Document::updateStyleForNodeIfNeeded(Node* node) 1767 void Document::updateStyleForNodeIfNeeded(Node* node)
1768 { 1768 {
1769 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc()) 1769 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc())
1770 return; 1770 return;
1771 1771
1772 bool needsStyleRecalc = hasPendingForcedStyleRecalc(); 1772 bool needsStyleRecalc = hasPendingForcedStyleRecalc();
1773 for (Node* ancestor = node; ancestor && !needsStyleRecalc; ancestor = ancest or->parentOrShadowHostNode()) 1773 for (Node* ancestor = node; ancestor && !needsStyleRecalc; ancestor = ancest or->parentOrShadowHostNode())
(...skipping 3579 matching lines...) Expand 10 before | Expand all | Expand 10 after
5353 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode) 5353 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode)
5354 { 5354 {
5355 if (!isActive()) 5355 if (!isActive())
5356 return; 5356 return;
5357 5357
5358 styleEngine()->modifiedStyleSheet(sheet); 5358 styleEngine()->modifiedStyleSheet(sheet);
5359 styleResolverChanged(when, updateMode); 5359 styleResolverChanged(when, updateMode);
5360 } 5360 }
5361 5361
5362 } // namespace WebCore 5362 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698