Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 6 insertions, 14 deletions

diff --git a/WebCore/rendering/RenderThemeChromiumWin.cpp b/WebCore/rendering/RenderThemeChromiumWin.cpp
index cc7570c..d82fddc 100644
--- a/WebCore/rendering/RenderThemeChromiumWin.cpp
+++ b/WebCore/rendering/RenderThemeChromiumWin.cpp
@@ -679,21 +679,13 @@ void RenderThemeChromiumWin::adjustProgressBarStyle(CSSStyleSelector*, RenderSty
 
 bool RenderThemeChromiumWin::paintProgressBar(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
-    RenderProgress* renderProgress = toRenderProgress(o);
-
-    IntRect valueRect;
-    if (renderProgress->isDeterminate()) {
-        int dx = r.width() * renderProgress->position();
-        if (renderProgress->style()->direction() == RTL)
-            valueRect = IntRect(r.x() + r.width() - dx, r.y(), dx, r.height());
-        else
-            valueRect = IntRect(r.x(), r.y(), dx, r.height());
-    } else {
-        // For indeterminate bar, valueRect is ignored and it is computed by the theme engine
-        // because the animation is a platform detail and WebKit doesn't need to know how.
-        valueRect = IntRect(0, 0, 0, 0);
-    }
+    if (!o->isProgress())
+        return true;
 
+    RenderProgress* renderProgress = toRenderProgress(o);
+    // For indeterminate bar, valueRect is ignored and it is computed by the theme engine
+    // because the animation is a platform detail and WebKit doesn't need to know how.
+    IntRect valueRect = renderProgress->isDeterminate() ? determinateProgressValueRectFor(renderProgress, r) : IntRect(0, 0, 0, 0);
     double animatedSeconds = renderProgress->animationStartTime() ?  WTF::currentTime() - renderProgress->animationStartTime() : 0;
     ThemePainter painter(i.context, r);
     ChromiumBridge::paintProgressBar(painter.context(), r, valueRect, renderProgress->isDeterminate(), animatedSeconds);