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

Side by Side Diff: Source/core/rendering/RenderProgress.cpp

Issue 476543003: Stop RenderProgress timer on destruction. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Stop RenderProgress timer on destroy() Created 6 years, 4 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
« no previous file with comments | « Source/core/rendering/RenderProgress.h ('k') | no next file » | 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 26 matching lines...) Expand all
37 , m_animationDuration(0) 37 , m_animationDuration(0)
38 , m_animating(false) 38 , m_animating(false)
39 , m_animationTimer(this, &RenderProgress::animationTimerFired) 39 , m_animationTimer(this, &RenderProgress::animationTimerFired)
40 { 40 {
41 } 41 }
42 42
43 RenderProgress::~RenderProgress() 43 RenderProgress::~RenderProgress()
44 { 44 {
45 } 45 }
46 46
47 void RenderProgress::destroy()
48 {
49 if (m_animating) {
50 m_animationTimer.stop();
51 m_animating = false;
52 }
53 RenderBlockFlow::destroy();
54 }
55
47 void RenderProgress::updateFromElement() 56 void RenderProgress::updateFromElement()
48 { 57 {
49 HTMLProgressElement* element = progressElement(); 58 HTMLProgressElement* element = progressElement();
50 if (m_position == element->position()) 59 if (m_position == element->position())
51 return; 60 return;
52 m_position = element->position(); 61 m_position = element->position();
53 62
54 updateAnimationState(); 63 updateAnimationState();
55 setShouldDoFullPaintInvalidation(true); 64 setShouldDoFullPaintInvalidation(true);
56 RenderBlockFlow::updateFromElement(); 65 RenderBlockFlow::updateFromElement();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 return 0; 106 return 0;
98 107
99 if (isHTMLProgressElement(*node())) 108 if (isHTMLProgressElement(*node()))
100 return toHTMLProgressElement(node()); 109 return toHTMLProgressElement(node());
101 110
102 ASSERT(node()->shadowHost()); 111 ASSERT(node()->shadowHost());
103 return toHTMLProgressElement(node()->shadowHost()); 112 return toHTMLProgressElement(node()->shadowHost());
104 } 113 }
105 114
106 } // namespace blink 115 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderProgress.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698