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

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

Issue 53373003: Remove display:run-in as per https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/_tHSX… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix test Created 7 years, 1 month 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/rendering/RenderProgress.h ('k') | Source/core/rendering/RenderSlider.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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 HTMLProgressElement* element = progressElement(); 51 HTMLProgressElement* element = progressElement();
52 if (m_position == element->position()) 52 if (m_position == element->position())
53 return; 53 return;
54 m_position = element->position(); 54 m_position = element->position();
55 55
56 updateAnimationState(); 56 updateAnimationState();
57 repaint(); 57 repaint();
58 RenderBlock::updateFromElement(); 58 RenderBlock::updateFromElement();
59 } 59 }
60 60
61 bool RenderProgress::canBeReplacedWithInlineRunIn() const
62 {
63 return false;
64 }
65
66 double RenderProgress::animationProgress() const 61 double RenderProgress::animationProgress() const
67 { 62 {
68 return m_animating ? (fmod((currentTime() - m_animationStartTime), m_animati onDuration) / m_animationDuration) : 0; 63 return m_animating ? (fmod((currentTime() - m_animationStartTime), m_animati onDuration) / m_animationDuration) : 0;
69 } 64 }
70 65
71 bool RenderProgress::isDeterminate() const 66 bool RenderProgress::isDeterminate() const
72 { 67 {
73 return (HTMLProgressElement::IndeterminatePosition != position() 68 return (HTMLProgressElement::IndeterminatePosition != position()
74 && HTMLProgressElement::InvalidPosition != position()); 69 && HTMLProgressElement::InvalidPosition != position());
75 } 70 }
(...skipping 28 matching lines...) Expand all
104 return 0; 99 return 0;
105 100
106 if (isHTMLProgressElement(node())) 101 if (isHTMLProgressElement(node()))
107 return toHTMLProgressElement(node()); 102 return toHTMLProgressElement(node());
108 103
109 ASSERT(node()->shadowHost()); 104 ASSERT(node()->shadowHost());
110 return toHTMLProgressElement(node()->shadowHost()); 105 return toHTMLProgressElement(node()->shadowHost());
111 } 106 }
112 107
113 } // namespace WebCore 108 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderProgress.h ('k') | Source/core/rendering/RenderSlider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698