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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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/Animation.cpp ('k') | Source/core/animation/EffectInput.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) 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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/animation/DocumentAnimations.h" 32 #include "core/animation/DocumentAnimations.h"
33 33
34 #include "core/animation/AnimationClock.h" 34 #include "core/animation/AnimationClock.h"
35 #include "core/animation/AnimationTimeline.h" 35 #include "core/animation/AnimationTimeline.h"
36 #include "core/dom/Document.h" 36 #include "core/dom/Document.h"
37 #include "core/dom/Element.h" 37 #include "core/dom/Element.h"
38 #include "core/dom/Node.h" 38 #include "core/dom/Node.h"
39 #include "core/dom/NodeLayoutStyle.h" 39 #include "core/dom/NodeComputedStyle.h"
40 #include "core/frame/FrameView.h" 40 #include "core/frame/FrameView.h"
41 #include "core/frame/LocalFrame.h" 41 #include "core/frame/LocalFrame.h"
42 #include "core/layout/LayoutView.h" 42 #include "core/layout/LayoutView.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 namespace { 46 namespace {
47 47
48 void updateAnimationTiming(Document& document, TimingUpdateReason reason) 48 void updateAnimationTiming(Document& document, TimingUpdateReason reason)
49 { 49 {
(...skipping 12 matching lines...) Expand all
62 { 62 {
63 if (needsOutdatedAnimationPlayerUpdate(document) || document.timeline().need sAnimationTimingUpdate()) 63 if (needsOutdatedAnimationPlayerUpdate(document) || document.timeline().need sAnimationTimingUpdate())
64 updateAnimationTiming(document, TimingUpdateOnDemand); 64 updateAnimationTiming(document, TimingUpdateOnDemand);
65 } 65 }
66 66
67 void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CS SPropertyID property) 67 void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CS SPropertyID property)
68 { 68 {
69 if (!node.isElementNode()) 69 if (!node.isElementNode())
70 return; 70 return;
71 const Element& element = toElement(node); 71 const Element& element = toElement(node);
72 if (const LayoutStyle* style = element.layoutStyle()) { 72 if (const ComputedStyle* style = element.computedStyle()) {
73 if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationO nCompositor()) 73 if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationO nCompositor())
74 || ((property == CSSPropertyTransform || property == CSSPropertyWebk itTransform) && style->isRunningTransformAnimationOnCompositor()) 74 || ((property == CSSPropertyTransform || property == CSSPropertyWebk itTransform) && style->isRunningTransformAnimationOnCompositor())
75 || (property == CSSPropertyWebkitFilter && style->isRunningFilterAni mationOnCompositor())) { 75 || (property == CSSPropertyWebkitFilter && style->isRunningFilterAni mationOnCompositor())) {
76 updateAnimationTiming(element.document(), TimingUpdateOnDemand); 76 updateAnimationTiming(element.document(), TimingUpdateOnDemand);
77 } 77 }
78 } 78 }
79 } 79 }
80 80
81 bool DocumentAnimations::needsOutdatedAnimationPlayerUpdate(const Document& docu ment) 81 bool DocumentAnimations::needsOutdatedAnimationPlayerUpdate(const Document& docu ment)
82 { 82 {
83 return document.timeline().hasOutdatedAnimationPlayer(); 83 return document.timeline().hasOutdatedAnimationPlayer();
84 } 84 }
85 85
86 void DocumentAnimations::updateCompositorAnimations(Document& document) 86 void DocumentAnimations::updateCompositorAnimations(Document& document)
87 { 87 {
88 ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean); 88 ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean);
89 if (document.compositorPendingAnimations().update()) { 89 if (document.compositorPendingAnimations().update()) {
90 ASSERT(document.view()); 90 ASSERT(document.view());
91 document.view()->scheduleAnimation(); 91 document.view()->scheduleAnimation();
92 } 92 }
93 93
94 document.timeline().scheduleNextService(); 94 document.timeline().scheduleNextService();
95 } 95 }
96 96
97 } // namespace blink 97 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/Animation.cpp ('k') | Source/core/animation/EffectInput.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698