Changeset 90384 in webkit

Timestamp:

Jul 4, 2011 9:21:24 PM (13 years ago)

Author:

dominicc@chromium.org

Message:

2011-07-04 Dominic Cooney <​dominicc@chromium.org>

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLProgressElement.cpp (modified) (1 diff)
• html/HTMLProgressElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-04  Dominic Cooney   <dominicc@chromium.org>
+
+        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  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/html/HTMLProgressElement.cpp

@@ -130 +130 @@
 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());

trunk/Source/WebCore/html/HTMLProgressElement.h

@@ -44 +44 @@
     double position() const;
 
-    bool isDeterminate();
+    bool isDeterminate() const;
     
     virtual bool canContainRangeEndPoint() const { return false; }