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

Side by Side Diff: Source/core/layout/LayoutProgress.cpp

Issue 952593003: Remove argument to progress bar timing methods on LayoutTheme. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/layout/LayoutTheme.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) 2010 Nokia Corporation and/or its subsidiary(-ies). 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 void LayoutProgress::animationTimerFired(Timer<LayoutProgress>*) 79 void LayoutProgress::animationTimerFired(Timer<LayoutProgress>*)
80 { 80 {
81 setShouldDoFullPaintInvalidation(); 81 setShouldDoFullPaintInvalidation();
82 if (!m_animationTimer.isActive() && m_animating) 82 if (!m_animationTimer.isActive() && m_animating)
83 m_animationTimer.startOneShot(m_animationRepeatInterval, FROM_HERE); 83 m_animationTimer.startOneShot(m_animationRepeatInterval, FROM_HERE);
84 } 84 }
85 85
86 void LayoutProgress::updateAnimationState() 86 void LayoutProgress::updateAnimationState()
87 { 87 {
88 m_animationDuration = LayoutTheme::theme().animationDurationForProgressBar(t his); 88 m_animationDuration = LayoutTheme::theme().animationDurationForProgressBar() ;
89 m_animationRepeatInterval = LayoutTheme::theme().animationRepeatIntervalForP rogressBar(this); 89 m_animationRepeatInterval = LayoutTheme::theme().animationRepeatIntervalForP rogressBar();
90 90
91 bool animating = style()->hasAppearance() && m_animationDuration > 0; 91 bool animating = style()->hasAppearance() && m_animationDuration > 0;
92 if (animating == m_animating) 92 if (animating == m_animating)
93 return; 93 return;
94 94
95 m_animating = animating; 95 m_animating = animating;
96 if (m_animating) { 96 if (m_animating) {
97 m_animationStartTime = currentTime(); 97 m_animationStartTime = currentTime();
98 m_animationTimer.startOneShot(m_animationRepeatInterval, FROM_HERE); 98 m_animationTimer.startOneShot(m_animationRepeatInterval, FROM_HERE);
99 } else { 99 } else {
100 m_animationTimer.stop(); 100 m_animationTimer.stop();
101 } 101 }
102 } 102 }
103 103
104 HTMLProgressElement* LayoutProgress::progressElement() const 104 HTMLProgressElement* LayoutProgress::progressElement() const
105 { 105 {
106 if (!node()) 106 if (!node())
107 return 0; 107 return 0;
108 108
109 if (isHTMLProgressElement(*node())) 109 if (isHTMLProgressElement(*node()))
110 return toHTMLProgressElement(node()); 110 return toHTMLProgressElement(node());
111 111
112 ASSERT(node()->shadowHost()); 112 ASSERT(node()->shadowHost());
113 return toHTMLProgressElement(node()->shadowHost()); 113 return toHTMLProgressElement(node()->shadowHost());
114 } 114 }
115 115
116 } // namespace blink 116 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/layout/LayoutTheme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698