- Draw glossy animation effect for determinate progress bar

- Moved animation code for indeterminate bar from WebKit
because adding change above makes webkit-side
too complicated.

Note:
- This change depends https://webkit.org/b/39269
- Appearance of indeterminate bar remains incorrect.
I filed it to http://crbug.com/44433.

Patch by Hajime Morita <morrita@g>
Original code review: http://codereview.chromium.org/2131008/show
BUG=44430
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47618 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 19 insertions, 20 deletions

diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc
index 0d2b563..71913ef 100644
--- a/webkit/glue/webthemeengine_impl_win.cc
+++ b/webkit/glue/webthemeengine_impl_win.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.  Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #include "webkit/glue/webthemeengine_impl_win.h"
 
@@ -115,17 +115,15 @@ void WebThemeEngineImpl::paintTrackbar(
 }
 
 void WebThemeEngineImpl::paintProgressBar(
-      WebKit::WebCanvas* canvas,
-      const WebKit::WebRect& barRect, 
-      int valuePart, const WebKit::WebRect& valueRect)
-
+    WebCanvas* canvas, const WebRect& barRect, const WebRect& valueRect,
+    bool determinate, double animatedSeconds)
 {
   HDC hdc = canvas->beginPlatformPaint();
   RECT native_bar_rect = WebRectToRECT(barRect);
   RECT native_value_rect = WebRectToRECT(valueRect);
   gfx::NativeTheme::instance()->PaintProgressBar(
-      hdc, &native_bar_rect, 
-      valuePart, &native_value_rect, canvas);
+      hdc, &native_bar_rect,
+      &native_value_rect, determinate, animatedSeconds, canvas);
   canvas->endPlatformPaint();
 }
 
diff --git a/webkit/glue/webthemeengine_impl_win.h b/webkit/glue/webthemeengine_impl_win.h
index 73cb42d..b57b915 100644
--- a/webkit/glue/webthemeengine_impl_win.h
+++ b/webkit/glue/webthemeengine_impl_win.h
@@ -35,9 +35,9 @@ class WebThemeEngineImpl : public WebKit::WebThemeEngine {
       WebKit::WebCanvas*, int part, int state, int classic_state,
       const WebKit::WebRect&);
   virtual void paintProgressBar(
-      WebKit::WebCanvas*,
-      const WebKit::WebRect& barRect, 
-      int valuePart, const WebKit::WebRect& valueRect);
+      WebKit::WebCanvas*, const WebKit::WebRect& barRect,
+      const WebKit::WebRect& valueRect, bool determinate,
+      double animatedSeconds);
 };
 
 }  // namespace webkit_glue
diff --git a/webkit/tools/test_shell/test_shell_webthemeengine.cc b/webkit/tools/test_shell/test_shell_webthemeengine.cc
index 8c457a8..6deb9a8 100644
--- a/webkit/tools/test_shell/test_shell_webthemeengine.cc
+++ b/webkit/tools/test_shell/test_shell_webthemeengine.cc
@@ -543,11 +543,12 @@ void Engine::paintTrackbar(WebCanvas* canvas, int part, int state,
 
 void Engine::paintProgressBar(WebKit::WebCanvas* canvas,
                               const WebKit::WebRect& barRect,
-                              int valuePart, const WebKit::WebRect& valueRect) {
-    Control::Type ctype = Control::kProgressBar_Type;
-    Control::State cstate = valuePart == PP_FILL ?
-        Control::kNormal_State : Control::kIndeterminate_State;
-    drawProgressBar(canvas, ctype, cstate, barRect, valueRect);
+                              const WebKit::WebRect& valueRect,
+                              bool determinate, double) {
+  Control::Type ctype = Control::kProgressBar_Type;
+  Control::State cstate =
+      determinate ? Control::kNormal_State : Control::kIndeterminate_State;
+  drawProgressBar(canvas, ctype, cstate, barRect, valueRect);
 }
 
 }  // namespace TestShellWebTheme
diff --git a/webkit/tools/test_shell/test_shell_webthemeengine.h b/webkit/tools/test_shell/test_shell_webthemeengine.h
index 2d4223d..617cf7d 100644
--- a/webkit/tools/test_shell/test_shell_webthemeengine.h
+++ b/webkit/tools/test_shell/test_shell_webthemeengine.h
@@ -54,9 +54,9 @@ class Engine : public WebKit::WebThemeEngine {
       WebKit::WebCanvas*, int part, int state, int classic_state,
       const WebKit::WebRect&);
   virtual void paintProgressBar(
-      WebKit::WebCanvas*,
-      const WebKit::WebRect& barRect,
-      int valuePart, const WebKit::WebRect& valueRect);
+      WebKit::WebCanvas*, const WebKit::WebRect& barRect,
+      const WebKit::WebRect& valueRect,
+      bool determinate, double time);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Engine);