Changeset 90384 in webkit
- Timestamp:
- Jul 4, 2011 9:21:24 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r90382 r90384 1 2011-07-04 Dominic Cooney <dominicc@chromium.org> 2 3 Simplify <progress> element's isDeterminate logic. 4 https://bugs.webkit.org/show_bug.cgi?id=63889 5 6 Reviewed by Hajime Morita. 7 8 Covered by existing tests 9 fast/dom/HTMLProgressElement/indeterminate-progress-*.html 10 11 * html/HTMLProgressElement.cpp: 12 (WebCore::HTMLProgressElement::position): don't duplicate isDeterminate 13 (WebCore::HTMLProgressElement::isDeterminate): remove redundant tests 14 (WebCore::HTMLProgressElement::didElementStateChange): fix formatting 15 * html/HTMLProgressElement.h: 16 1 17 2011-07-04 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 18 -
trunk/Source/WebCore/html/HTMLProgressElement.cpp
r90351 r90384 130 130 double HTMLProgressElement::position() const 131 131 { 132 if (! hasAttribute(valueAttr))132 if (!isDeterminate()) 133 133 return HTMLProgressElement::IndeterminatePosition; 134 134 return value() / max(); 135 135 } 136 136 137 bool HTMLProgressElement::isDeterminate() 137 bool HTMLProgressElement::isDeterminate() const 138 138 { 139 double currentPosition = position(); 140 return (HTMLProgressElement::IndeterminatePosition != currentPosition && HTMLProgressElement::InvalidPosition != currentPosition); 139 return fastHasAttribute(valueAttr); 141 140 } 142 141 143 142 void HTMLProgressElement::didElementStateChange() 144 143 { 145 m_value->setWidthPercentage(position() *100);144 m_value->setWidthPercentage(position() * 100); 146 145 if (renderer()) { 147 146 RenderProgress* render = toRenderProgress(renderer()); -
trunk/Source/WebCore/html/HTMLProgressElement.h
r88793 r90384 44 44 double position() const; 45 45 46 bool isDeterminate() ;46 bool isDeterminate() const; 47 47 48 48 virtual bool canContainRangeEndPoint() const { return false; }
Note: See TracChangeset
for help on using the changeset viewer.