Title: [90384] trunk/Source/WebCore
- Revision
- 90384
- Author
- [email protected]
- Date
- 2011-07-04 21:21:24 -0700 (Mon, 04 Jul 2011)
Log Message
2011-07-04 Dominic Cooney <[email protected]>
Simplify <progress> element's isDeterminate logic.
https://bugs.webkit.org/show_bug.cgi?id=63889
Reviewed by Hajime Morita.
Covered by existing tests
fast/dom/HTMLProgressElement/indeterminate-progress-*.html
* html/HTMLProgressElement.cpp:
(WebCore::HTMLProgressElement::position): don't duplicate isDeterminate
(WebCore::HTMLProgressElement::isDeterminate): remove redundant tests
(WebCore::HTMLProgressElement::didElementStateChange): fix formatting
* html/HTMLProgressElement.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90383 => 90384)
--- trunk/Source/WebCore/ChangeLog 2011-07-05 02:59:02 UTC (rev 90383)
+++ trunk/Source/WebCore/ChangeLog 2011-07-05 04:21:24 UTC (rev 90384)
@@ -1,3 +1,19 @@
+2011-07-04 Dominic Cooney <[email protected]>
+
+ Simplify <progress> element's isDeterminate logic.
+ https://bugs.webkit.org/show_bug.cgi?id=63889
+
+ Reviewed by Hajime Morita.
+
+ Covered by existing tests
+ fast/dom/HTMLProgressElement/indeterminate-progress-*.html
+
+ * html/HTMLProgressElement.cpp:
+ (WebCore::HTMLProgressElement::position): don't duplicate isDeterminate
+ (WebCore::HTMLProgressElement::isDeterminate): remove redundant tests
+ (WebCore::HTMLProgressElement::didElementStateChange): fix formatting
+ * html/HTMLProgressElement.h:
+
2011-07-04 Gyuyoung Kim <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/html/HTMLProgressElement.cpp (90383 => 90384)
--- trunk/Source/WebCore/html/HTMLProgressElement.cpp 2011-07-05 02:59:02 UTC (rev 90383)
+++ trunk/Source/WebCore/html/HTMLProgressElement.cpp 2011-07-05 04:21:24 UTC (rev 90384)
@@ -129,20 +129,19 @@
double HTMLProgressElement::position() const
{
- if (!hasAttribute(valueAttr))
+ if (!isDeterminate())
return HTMLProgressElement::IndeterminatePosition;
return value() / max();
}
-bool HTMLProgressElement::isDeterminate()
+bool HTMLProgressElement::isDeterminate() const
{
- double currentPosition = position();
- return (HTMLProgressElement::IndeterminatePosition != currentPosition && HTMLProgressElement::InvalidPosition != currentPosition);
+ return fastHasAttribute(valueAttr);
}
void HTMLProgressElement::didElementStateChange()
{
- m_value->setWidthPercentage(position()*100);
+ m_value->setWidthPercentage(position() * 100);
if (renderer()) {
RenderProgress* render = toRenderProgress(renderer());
bool wasDeterminate = render->isDeterminate();
Modified: trunk/Source/WebCore/html/HTMLProgressElement.h (90383 => 90384)
--- trunk/Source/WebCore/html/HTMLProgressElement.h 2011-07-05 02:59:02 UTC (rev 90383)
+++ trunk/Source/WebCore/html/HTMLProgressElement.h 2011-07-05 04:21:24 UTC (rev 90384)
@@ -43,7 +43,7 @@
double position() const;
- bool isDeterminate();
+ bool isDeterminate() const;
virtual bool canContainRangeEndPoint() const { return false; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
