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

Side by Side Diff: Source/core/animation/DocumentAnimations.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after Doug's review. Created 5 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
« no previous file with comments | « no previous file | Source/core/animation/css/CSSAnimations.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 { 63 {
64 if (needsOutdatedAnimationPlayerUpdate(document) || document.timeline().need sAnimationTimingUpdate()) 64 if (needsOutdatedAnimationPlayerUpdate(document) || document.timeline().need sAnimationTimingUpdate())
65 updateAnimationTiming(document, TimingUpdateOnDemand); 65 updateAnimationTiming(document, TimingUpdateOnDemand);
66 } 66 }
67 67
68 void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CS SPropertyID property) 68 void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CS SPropertyID property)
69 { 69 {
70 if (!node.isElementNode()) 70 if (!node.isElementNode())
71 return; 71 return;
72 const Element& element = toElement(node); 72 const Element& element = toElement(node);
73 if (LayoutStyle* style = element.layoutStyle()) { 73 if (const LayoutStyle* style = element.layoutStyle()) {
74 if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationO nCompositor()) 74 if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationO nCompositor())
75 || ((property == CSSPropertyTransform || property == CSSPropertyWebk itTransform) && style->isRunningTransformAnimationOnCompositor()) 75 || ((property == CSSPropertyTransform || property == CSSPropertyWebk itTransform) && style->isRunningTransformAnimationOnCompositor())
76 || (property == CSSPropertyWebkitFilter && style->isRunningFilterAni mationOnCompositor())) { 76 || (property == CSSPropertyWebkitFilter && style->isRunningFilterAni mationOnCompositor())) {
77 updateAnimationTiming(element.document(), TimingUpdateOnDemand); 77 updateAnimationTiming(element.document(), TimingUpdateOnDemand);
78 } 78 }
79 } 79 }
80 } 80 }
81 81
82 bool DocumentAnimations::needsOutdatedAnimationPlayerUpdate(const Document& docu ment) 82 bool DocumentAnimations::needsOutdatedAnimationPlayerUpdate(const Document& docu ment)
83 { 83 {
84 return document.timeline().hasOutdatedAnimationPlayer(); 84 return document.timeline().hasOutdatedAnimationPlayer();
85 } 85 }
86 86
87 // FIXME: Rename to updateCompositorAnimations 87 // FIXME: Rename to updateCompositorAnimations
88 void DocumentAnimations::startPendingAnimations(Document& document) 88 void DocumentAnimations::startPendingAnimations(Document& document)
89 { 89 {
90 ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean); 90 ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean);
91 if (document.compositorPendingAnimations().update()) { 91 if (document.compositorPendingAnimations().update()) {
92 ASSERT(document.view()); 92 ASSERT(document.view());
93 document.view()->scheduleAnimation(); 93 document.view()->scheduleAnimation();
94 } 94 }
95 95
96 document.timeline().scheduleNextService(); 96 document.timeline().scheduleNextService();
97 } 97 }
98 98
99 } // namespace blink 99 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/css/CSSAnimations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698