Test shell: Fix Windows custom render theme so that checkboxes and radio buttons are drawn at a fixed size (13x13).

This matches system windows themes.

Also add expectations.

BUG=32307
TEST=fast/css/non-standard-checkbox-size.html

Review URL: http://codereview.chromium.org/565045

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

37 files changed, 58 insertions, 26 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum
new file mode 100644
index 0000000..8dc1660
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum
@@ -0,0 +1 @@
+cda4cb9a971a1b92fbe77bc5feff3ebf
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.png
new file mode 100644
index 0000000..d4529b4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.txt
new file mode 100644
index 0000000..c356742
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/non-standard-checkbox-size-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,38) size 272x19
+        text run at (0,38) width 272: "The following inputs should not be stretched. "
+      RenderBlock {INPUT} at (276,3) size 13x50
+      RenderText {#text} at (292,38) size 4x19
+        text run at (292,38) width 4: " "
+      RenderBlock {INPUT} at (301,3) size 13x50
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.checksum
index ce7741a..6b452d6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.checksum
@@ -1 +1 @@
-714ec751e15713bf8ef5ab73d9d572c7
\ No newline at end of file
+2722985612f14fd29bfc53e9c9dff240
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.png
index 778e89c..a3ba031 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/001-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.checksum
index 65bf658..226e0eb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.checksum
@@ -1 +1 @@
-da7e09069630b1dbefe724dd71b5e0b3
\ No newline at end of file
+ce4ee677c1776d557d1a07c160aa5aad
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.png
index 031a8685..e2aab8b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/basic-inputs-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum
index 98dbcb0..20e1ad3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum
@@ -1 +1 @@
-0216a4b4a334a8a531c2ff4c06e3f374
\ No newline at end of file
+bf724d5694f864438054224fe7da8b51
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png
index 4ae8f67..1f81b1c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.checksum
index 1a9d421..5791ff67 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.checksum
@@ -1 +1 @@
-a3eddfaebca8fe1a0bf799b8171dabc4
\ No newline at end of file
+7ec2c3a388baf8a575f482dc57dbe826
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.png
index a0e5db1..167dd9f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/checkbox-radio-onchange-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.checksum
index c9b391f..e9fc825 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.checksum
@@ -1 +1 @@
-5e9215216c700c7a9e68d7e9f02057bd
\ No newline at end of file
+8547615239f4635295874297e04268a5
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.png
index 9265603..903e04a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
index 86d4686..c5fff87 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
@@ -1 +1 @@
-21feea4e6427e47d1cd312b11bcb2e73
\ No newline at end of file
+a92f7c6adb11faa6bad03b0b107f4547
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
index 22d4c38..fe7d1a6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.checksum
index 58d16bf..13c688c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.checksum
@@ -1 +1 @@
-5e03dcb41f2df149d34a70b1ccc621d6
\ No newline at end of file
+31677d3769788e97d794be4454f4e35d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.png
index 795568c..828945c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/indeterminate-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum
index 063d3b4..aa057c1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum
@@ -1 +1 @@
-1d57cbab6d570eee3051540992939da9
\ No newline at end of file
+a4f054d796743d97b4683abf43e4f7c9
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png
index 0c3f1ed..ab9b469 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.checksum
index 50393e2..17de28a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.checksum
@@ -1 +1 @@
-5952a79a51e306d34a45617a7d6ee392
\ No newline at end of file
+252e59b68e9151f2d28677bdff9f8be1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.png
index 67ef2f8..80b20fa 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.checksum
index ae2c6e1..ebbaa5a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.checksum
@@ -1 +1 @@
-4c5a7db3d99aaeb70f11e4613edf9801
\ No newline at end of file
+1607f506dd9c3bd044264c0c82cbd19e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.png
index 781b9f4..1d356f3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/bad-xml-slash-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.checksum
index 42e2c57..147358c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.checksum
@@ -1 +1 @@
-b194ce81464c87bc01b662c17502d5cc
\ No newline at end of file
+d07cdbd5af7b7a4c90ab7675cf440de7
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.png
index a557dc0..aef3810 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.checksum
index 68e7a9d..ddd59d0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.checksum
@@ -1 +1 @@
-77f2fed46dec8ba7ad882f23809e45f1
\ No newline at end of file
+f52e386a501821518aaab5f33397b406
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.png
index e28332c..68caef2 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-checkbox-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.checksum
index 630191e..764fda9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.checksum
@@ -1 +1 @@
-f7d20100dd74c69d9adb24e522a06dfc
\ No newline at end of file
+85da6471022dfe781307bb1a62e5018a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.png
index aaa4552..5cf0803 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-radio-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.checksum
index 6a23ef7..929be42 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.checksum
@@ -1 +1 @@
-443704e3d94f66b3387851bb907e93e3
\ No newline at end of file
+8e1c790b1519ef94655d78ebf0d0f2d9
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.png
index 0adf2fc..e96886d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/textIteratorNilRenderer-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum
index 19c1ddc..3f7c2e2 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum
@@ -1 +1 @@
-5393264d2d1944f41f03c25f05c8c82f
\ No newline at end of file
+aee73f065dc50c1eba35020b251fd513
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.png
index 116239c..a68b294 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum
index 3583387..f28f32e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum
@@ -1 +1 @@
-2efdfb05dfa8d35fa3e1496e63c26bb0
\ No newline at end of file
+c53a0cad3cf90367e2d1ed4cc16edd49
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png
index c3c7931..dfcc3f7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6af648e..e28b0b9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2824,9 +2824,6 @@ BUG32235 LINUX DEBUG : svg/W3C-SVG-1.1/filters-diffuse-01-f.svg = PASS TEXT
 // Errors from roll from 53207:53246
 BUG32398 MAC : svg/custom/resource-invalidate-on-target-update.svg = IMAGE PASS
 
-// Bugs from rolling from 53275:53289
-BUG32307 WIN : fast/css/non-standard-checkbox-size.html = IMAGE+TEXT
-
 BUG32308 DEBUG : fast/frames/cached-frame-counter.html = TIMEOUT
 
 // WebKit roll: 53290:53313
diff --git a/webkit/tools/test_shell/test_shell_webthemecontrol.cc b/webkit/tools/test_shell/test_shell_webthemecontrol.cc
index f3071c1..742a295 100644
--- a/webkit/tools/test_shell/test_shell_webthemecontrol.cc
+++ b/webkit/tools/test_shell/test_shell_webthemecontrol.cc
@@ -33,18 +33,38 @@ const SkColor kBgColors[] = {
   SkColorSetRGB(0xa9, 0xff, 0x12)   // Pressed
 };
 
+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,
                  Type ctype, State cstate)
     : canvas_(canvas),
-      irect_(irect),
+      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()),
+      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) {