Merge 73488

WebCore/rendering/RenderProgress.cpp

 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 36 matching lines @@
 }
 
 RenderProgress::~RenderProgress()
 {
     if (m_valuePart)
         m_valuePart->detach();
 }
 
 void RenderProgress::updateFromElement()
 {
+    if (!m_valuePart) {
+        m_valuePart = ShadowBlockElement::createForPart(static_cast<HTMLElement*>(node()), PROGRESS_BAR_VALUE);
+        if (m_valuePart->renderer())
+            addChild(m_valuePart->renderer());
+    }
+
+    if (shouldHaveParts())
+        style()->setAppearance(NoControlPart);
+    else if (m_valuePart->renderer())
+        m_valuePart->renderer()->style()->setVisibility(HIDDEN);
+
     HTMLProgressElement* element = progressElement();
     if (m_position == element->position())
         return;
     m_position = element->position();
 
     updateAnimationState();
     RenderIndicator::updateFromElement();
 }
 
 double RenderProgress::animationProgress() const
@@ skipping 16 matching lines @@
     if (paintInfo.phase == PaintPhaseBlockBackground) {
         if (!m_animationTimer.isActive() && m_animating)
             m_animationTimer.startOneShot(m_animationRepeatInterval);
     }
 
     RenderIndicator::paint(paintInfo, tx, ty);
 }
 
 void RenderProgress::layoutParts()
 {
-    updatePartsState();
-    if (m_valuePart)
-        m_valuePart->layoutAsPart(valuePartRect());
+    m_valuePart->layoutAsPart(valuePartRect());
     updateAnimationState();
 }
 
 bool RenderProgress::shouldHaveParts() const
 {
     if (!style()->hasAppearance())
         return true;
     if (ShadowBlockElement::partShouldHaveStyle(this, PROGRESS_BAR_VALUE))
         return true;
     return false;
 }
 
-void RenderProgress::updatePartsState()
-{
-    if (shouldHaveParts() && !m_valuePart) {
-        style()->setAppearance(NoControlPart);
-        m_valuePart = ShadowBlockElement::createForPart(static_cast<HTMLElement*>(node()), PROGRESS_BAR_VALUE);
-        addChild(m_valuePart->renderer());
-    } else if (!shouldHaveParts() && m_valuePart) {
-        m_valuePart->detach();
-        m_valuePart = 0;
-    }
-}
-
 void RenderProgress::updateAnimationState()
 {
     m_animationDuration = theme()->animationDurationForProgressBar(this);
     m_animationRepeatInterval = theme()->animationRepeatIntervalForProgressBar(this);
 
     bool animating = style()->hasAppearance() && m_animationDuration > 0;
     if (animating == m_animating)
         return;
 
     m_animating = animating;
@@ skipping 13 matching lines @@
 }
 
 HTMLProgressElement* RenderProgress::progressElement() const
 {
     return static_cast<HTMLProgressElement*>(node());
 }    
 
 } // namespace WebCore
 
 #endif