Added support for HTML5 progress element.

webkit/tools/test_shell/test_shell_webthemecontrol.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 // This file implements a simple generic version of the WebKitThemeEngine,
 // which is used to draw all the native controls on a web page. We use this
 // file when running in layout test mode in order to remove any
 // platform-specific rendering differences due to themes, colors, etc.
 //
 
 #include "webkit/tools/test_shell/test_shell_webthemecontrol.h"
@@ skipping 11 matching lines @@
 const SkColor kFgColor       = SK_ColorBLACK;
 
 const SkColor kBgColors[] = {
   SK_ColorBLACK,                    // Unknown
   SkColorSetRGB(0xc9, 0xc9, 0xc9),  // Disabled
   SkColorSetRGB(0xf3, 0xe0, 0xd0),  // Readonly
   SkColorSetRGB(0x89, 0xc4, 0xff),  // Normal
   SkColorSetRGB(0x43, 0xf9, 0xff),  // Hot
   SkColorSetRGB(0x20, 0xf6, 0xcc),  // Focused
   SkColorSetRGB(0x00, 0xf3, 0xac),  // Hover
-  SkColorSetRGB(0xa9, 0xff, 0x12)   // Pressed
+  SkColorSetRGB(0xa9, 0xff, 0x12),  // Pressed
+  SkColorSetRGB(0xcc, 0xcc, 0xcc)   // Indeterminate
 };
 
 SkIRect Validate(const SkIRect& rect, Control::Type ctype) {
   SkIRect retval = rect;
   if (ctype == Control::kUncheckedBox_Type ||
       ctype == Control::kCheckedBox_Type ||
       ctype == Control::kUncheckedRadio_Type ||
       ctype == Control::kCheckedRadio_Type) {
     // The maximum width and height is 13. Center the square in the passed
     // rectangle.
     const int kMaxControlSize = 13;
     int control_size = std::min(rect.width(), rect.height());
     control_size = std::min(control_size, kMaxControlSize);
 
     retval.fLeft = rect.fLeft + (rect.width() / 2) - (control_size / 2);
     retval.fRight = retval.fLeft + control_size - 1;
     retval.fTop = rect.fTop + (rect.height() / 2) - (control_size / 2);
     retval.fBottom = retval.fTop + control_size - 1;
   }
   return retval;
 }
 
-Control::Control(skia::PlatformCanvas *canvas, const SkIRect &irect,
+Control::Control(skia::PlatformCanvas* canvas, const SkIRect& irect,
                  Type ctype, State cstate)
     : canvas_(canvas),
       irect_(Validate(irect, ctype)),
       type_(ctype),
       state_(cstate),
       left_(irect_.fLeft),
       right_(irect_.fRight),
       top_(irect_.fTop),
       bottom_(irect_.fBottom),
       height_(irect_.height()),
       width_(irect_.width()),
       edge_color_(kEdgeColor),
       bg_color_(kBgColors[cstate]),
       fg_color_(kFgColor) {
 }
 
 Control::~Control() {
 }
 
-void Control::box(const SkIRect &rect, SkColor fill_color) {
+void Control::box(const SkIRect& rect, SkColor fill_color) {
   SkPaint paint;
 
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(fill_color);
   canvas_->drawIRect(rect, paint);
 
   paint.setColor(edge_color_);
   paint.setStyle(SkPaint::kStroke_Style);
   canvas_->drawIRect(rect, paint);
 }
@@ skipping 317 matching lines @@
   if (draw_edges) {
     paint.setColor(edge_color_);
     paint.setStyle(SkPaint::kStroke_Style);
     canvas_->drawIRect(irect_, paint);
   }
 
   markState();
   canvas_->endPlatformPaint();
 }
 
+void
+Control::drawProgressBar(const SkIRect& fill_rect) {
+  SkPaint paint;
+
+  canvas_->beginPlatformPaint();
+  paint.setColor(bg_color_);
+  paint.setStyle(SkPaint::kFill_Style);
+  canvas_->drawIRect(irect_, paint);
+
+  // Emulate clipping
+  SkIRect tofill;
+  tofill.intersect(irect_, fill_rect);
+  paint.setColor(fg_color_);
+  paint.setStyle(SkPaint::kFill_Style);
+  canvas_->drawIRect(tofill, paint);
+
+  markState();
+  canvas_->endPlatformPaint();
+}
+
 }  // namespace TestShellWebTheme