Changeset 76379 in webkit

Timestamp:

Jan 21, 2011 12:26:01 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-21 Xiyuan Xia <​xiyuan@chromium.org>

Reviewed by Tony Chang.

Update chromium/linux baselines after drawing code moved into
WebThemeEngine.
​https://bugs.webkit.org/show_bug.cgi?id=52826

• platform/chromium-linux/css1/box_properties/acid_test-expected.checksum:
• platform/chromium-linux/css1/box_properties/acid_test-expected.png:
• platform/chromium-linux/css2.1/t09-c5526c-display-00-e-expected.checksum:
• platform/chromium-linux/css2.1/t09-c5526c-display-00-e-expected.png:
• platform/chromium-linux/fast/block/basic/011-expected.checksum:
• platform/chromium-linux/fast/block/basic/011-expected.png:
• platform/chromium-linux/fast/block/margin-collapse/103-expected.checksum:
• platform/chromium-linux/fast/block/margin-collapse/103-expected.png:
• platform/chromium-linux/fast/css/non-standard-checkbox-size-expected.checksum:
• platform/chromium-linux/fast/css/non-standard-checkbox-size-expected.png:
• platform/chromium-linux/fast/dom/HTMLProgressElement/progress-element-expected.checksum:
• platform/chromium-linux/fast/dom/HTMLProgressElement/progress-element-expected.png:
• platform/chromium-linux/fast/forms/basic-inputs-expected.checksum:
• platform/chromium-linux/fast/forms/basic-inputs-expected.png:
• platform/chromium-linux/fast/forms/basic-selects-expected.checksum:
• platform/chromium-linux/fast/forms/basic-selects-expected.png:
• platform/chromium-linux/fast/forms/box-shadow-override-expected.checksum:
• platform/chromium-linux/fast/forms/box-shadow-override-expected.png:
• platform/chromium-linux/fast/forms/checkbox-radio-onchange-expected.checksum:
• platform/chromium-linux/fast/forms/checkbox-radio-onchange-expected.png:
• platform/chromium-linux/fast/forms/file-input-disabled-expected.checksum:
• platform/chromium-linux/fast/forms/file-input-disabled-expected.png:
• platform/chromium-linux/fast/forms/form-element-geometry-expected.checksum:
• platform/chromium-linux/fast/forms/form-element-geometry-expected.png:
• platform/chromium-linux/fast/forms/formmove-expected.checksum:
• platform/chromium-linux/fast/forms/formmove-expected.png:
• platform/chromium-linux/fast/forms/formmove2-expected.checksum:
• platform/chromium-linux/fast/forms/formmove2-expected.png:
• platform/chromium-linux/fast/forms/indeterminate-expected.checksum:
• platform/chromium-linux/fast/forms/indeterminate-expected.png:
• platform/chromium-linux/fast/forms/input-appearance-height-expected.checksum:
• platform/chromium-linux/fast/forms/input-appearance-height-expected.png:
• platform/chromium-linux/fast/forms/input-value-expected.checksum:
• platform/chromium-linux/fast/forms/input-value-expected.png:
• platform/chromium-linux/fast/forms/menulist-restrict-line-height-expected.checksum:
• platform/chromium-linux/fast/forms/menulist-restrict-line-height-expected.png:
• platform/chromium-linux/fast/forms/menulist-style-color-expected.checksum:
• platform/chromium-linux/fast/forms/menulist-style-color-expected.png:
• platform/chromium-linux/fast/forms/placeholder-position-expected.checksum:
• platform/chromium-linux/fast/forms/placeholder-position-expected.png: Added property svn:mime-type.
• platform/chromium-linux/fast/forms/radio-attr-order-expected.checksum:
• platform/chromium-linux/fast/forms/radio-attr-order-expected.png:
• platform/chromium-linux/fast/forms/radio-nested-labels-expected.checksum:
• platform/chromium-linux/fast/forms/radio-nested-labels-expected.png:
• platform/chromium-linux/fast/forms/radio_checked-expected.checksum:
• platform/chromium-linux/fast/forms/radio_checked-expected.png:
• platform/chromium-linux/fast/forms/radio_checked_dynamic-expected.checksum:
• platform/chromium-linux/fast/forms/radio_checked_dynamic-expected.png:
• platform/chromium-linux/fast/forms/select-baseline-expected.checksum:
• platform/chromium-linux/fast/forms/select-baseline-expected.png:
• platform/chromium-linux/fast/inline/positionedLifetime-expected.checksum:
• platform/chromium-linux/fast/inline/positionedLifetime-expected.png:
• platform/chromium-linux/fast/parser/bad-xml-slash-expected.checksum:
• platform/chromium-linux/fast/parser/bad-xml-slash-expected.png:
• platform/chromium-linux/fast/replaced/replaced-breaking-expected.checksum:
• platform/chromium-linux/fast/replaced/replaced-breaking-expected.png:
• platform/chromium-linux/fast/replaced/width100percent-checkbox-expected.checksum:
• platform/chromium-linux/fast/replaced/width100percent-checkbox-expected.png:
• platform/chromium-linux/fast/text/textIteratorNilRenderer-expected.checksum:
• platform/chromium-linux/fast/text/textIteratorNilRenderer-expected.png:
• platform/chromium-linux/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum:
• platform/chromium-linux/fast/text/whitespace/normal-after-nowrap-breaking-expected.png:
• platform/chromium-linux/tables/mozilla/bugs/bug1318-expected.checksum:
• platform/chromium-linux/tables/mozilla/bugs/bug1318-expected.png:
• platform/chromium-linux/tables/mozilla/bugs/bug4527-expected.checksum:
• platform/chromium-linux/tables/mozilla/bugs/bug4527-expected.png: Added property svn:mime-type.
• platform/chromium-linux/tables/mozilla_expected_failures/core/captions1-expected.checksum:
• platform/chromium-linux/tables/mozilla_expected_failures/core/captions1-expected.png:
• platform/chromium-linux/tables/mozilla_expected_failures/core/captions2-expected.checksum:
• platform/chromium-linux/tables/mozilla_expected_failures/core/captions2-expected.png:

2011-01-21 Xiyuan Xia <​xiyuan@chromium.org>

Reviewed by Tony Chang.

Use WebThemeEngine for relevant RenderTheme parts for chromium/linux.
​https://bugs.webkit.org/show_bug.cgi?id=52826

• platform/chromium/ChromiumBridge.h:
• rendering/RenderThemeChromiumLinux.cpp: (WebCore::getWebThemeState): (WebCore::RenderThemeChromiumLinux::adjustSliderThumbSize): (WebCore::RenderThemeChromiumLinux::paintCheckbox): (WebCore::RenderThemeChromiumLinux::setCheckboxSize): (WebCore::RenderThemeChromiumLinux::paintRadio): (WebCore::RenderThemeChromiumLinux::setRadioSize): (WebCore::RenderThemeChromiumLinux::paintButton): (WebCore::RenderThemeChromiumLinux::paintTextField): (WebCore::RenderThemeChromiumLinux::paintMenuList): (WebCore::RenderThemeChromiumLinux::paintSliderTrack): (WebCore::RenderThemeChromiumLinux::paintSliderThumb): (WebCore::RenderThemeChromiumLinux::adjustInnerSpinButtonStyle): (WebCore::RenderThemeChromiumLinux::paintInnerSpinButton): (WebCore::RenderThemeChromiumLinux::paintProgressBar):
• rendering/RenderThemeChromiumLinux.h:
• rendering/RenderThemeChromiumSkia.cpp: (WebCore::RenderThemeChromiumSkia::setCheckboxSize): (WebCore::RenderThemeChromiumSkia::setSizeIfAuto): (WebCore::RenderThemeChromiumSkia::indeterminateProgressValueRectFor):
• rendering/RenderThemeChromiumSkia.h:

2011-01-21 Xiyuan Xia <​xiyuan@chromium.org>

Reviewed by Tony Chang.

Use WebThemeEngine for relevant RenderTheme parts for chromium/linux.
​https://bugs.webkit.org/show_bug.cgi?id=52826

• WebKit.gyp:
• src/ChromiumBridge.cpp: (WebCore::WebThemePart): (WebCore::GetWebThemeExtraParams):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-linux/css1/box_properties/acid_test-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/css1/box_properties/acid_test-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/css2.1/t09-c5526c-display-00-e-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/css2.1/t09-c5526c-display-00-e-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/block/basic/011-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/block/basic/011-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/block/margin-collapse/103-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/block/margin-collapse/103-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/css/non-standard-checkbox-size-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/css/non-standard-checkbox-size-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/dom/HTMLProgressElement/progress-element-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/dom/HTMLProgressElement/progress-element-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/basic-inputs-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/basic-inputs-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/basic-selects-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/basic-selects-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/box-shadow-override-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/box-shadow-override-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/checkbox-radio-onchange-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/checkbox-radio-onchange-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/form-element-geometry-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/form-element-geometry-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/formmove-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/formmove-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/formmove2-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/formmove2-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/indeterminate-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/indeterminate-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/input-appearance-height-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/input-appearance-height-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/input-value-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/input-value-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/menulist-restrict-line-height-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/menulist-restrict-line-height-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/menulist-style-color-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/menulist-style-color-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/placeholder-position-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/placeholder-position-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/radio-attr-order-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/radio-attr-order-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/radio-nested-labels-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/radio-nested-labels-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/radio_checked-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/radio_checked-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/radio_checked_dynamic-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/radio_checked_dynamic-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/forms/select-baseline-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/forms/select-baseline-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/inline/positionedLifetime-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/inline/positionedLifetime-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/parser/bad-xml-slash-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/parser/bad-xml-slash-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/replaced/replaced-breaking-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/replaced/replaced-breaking-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/replaced/width100percent-checkbox-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/replaced/width100percent-checkbox-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/text/textIteratorNilRenderer-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/text/textIteratorNilRenderer-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/text/whitespace/normal-after-nowrap-breaking-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug1318-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug1318-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug4527-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug4527-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/core/captions1-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/core/captions1-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/core/captions2-expected.checksum (modified) (1 diff)
• LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/core/captions2-expected.png (modified) (previous)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/chromium/PlatformBridge.h (modified) (4 diffs)
• Source/WebCore/rendering/RenderThemeChromiumLinux.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderThemeChromiumLinux.h (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (modified) (10 diffs)
• Source/WebCore/rendering/RenderThemeChromiumSkia.h (modified) (4 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/WebKit.gyp (modified) (1 diff)
• Source/WebKit/chromium/src/PlatformBridge.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-21  Xiyuan Xia  <xiyuan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Update chromium/linux baselines after drawing code moved into
+        WebThemeEngine.
+        https://bugs.webkit.org/show_bug.cgi?id=52826
+
+        * platform/chromium-linux/css1/box_properties/acid_test-expected.checksum:
+        * platform/chromium-linux/css1/box_properties/acid_test-expected.png:
+        * platform/chromium-linux/css2.1/t09-c5526c-display-00-e-expected.checksum:
+        * platform/chromium-linux/css2.1/t09-c5526c-display-00-e-expected.png:
+        * platform/chromium-linux/fast/block/basic/011-expected.checksum:
+        * platform/chromium-linux/fast/block/basic/011-expected.png:
+        * platform/chromium-linux/fast/block/margin-collapse/103-expected.checksum:
+        * platform/chromium-linux/fast/block/margin-collapse/103-expected.png:
+        * platform/chromium-linux/fast/css/non-standard-checkbox-size-expected.checksum:
+        * platform/chromium-linux/fast/css/non-standard-checkbox-size-expected.png:
+        * platform/chromium-linux/fast/dom/HTMLProgressElement/progress-element-expected.checksum:
+        * platform/chromium-linux/fast/dom/HTMLProgressElement/progress-element-expected.png:
+        * platform/chromium-linux/fast/forms/basic-inputs-expected.checksum:
+        * platform/chromium-linux/fast/forms/basic-inputs-expected.png:
+        * platform/chromium-linux/fast/forms/basic-selects-expected.checksum:
+        * platform/chromium-linux/fast/forms/basic-selects-expected.png:
+        * platform/chromium-linux/fast/forms/box-shadow-override-expected.checksum:
+        * platform/chromium-linux/fast/forms/box-shadow-override-expected.png:
+        * platform/chromium-linux/fast/forms/checkbox-radio-onchange-expected.checksum:
+        * platform/chromium-linux/fast/forms/checkbox-radio-onchange-expected.png:
+        * platform/chromium-linux/fast/forms/file-input-disabled-expected.checksum:
+        * platform/chromium-linux/fast/forms/file-input-disabled-expected.png:
+        * platform/chromium-linux/fast/forms/form-element-geometry-expected.checksum:
+        * platform/chromium-linux/fast/forms/form-element-geometry-expected.png:
+        * platform/chromium-linux/fast/forms/formmove-expected.checksum:
+        * platform/chromium-linux/fast/forms/formmove-expected.png:
+        * platform/chromium-linux/fast/forms/formmove2-expected.checksum:
+        * platform/chromium-linux/fast/forms/formmove2-expected.png:
+        * platform/chromium-linux/fast/forms/indeterminate-expected.checksum:
+        * platform/chromium-linux/fast/forms/indeterminate-expected.png:
+        * platform/chromium-linux/fast/forms/input-appearance-height-expected.checksum:
+        * platform/chromium-linux/fast/forms/input-appearance-height-expected.png:
+        * platform/chromium-linux/fast/forms/input-value-expected.checksum:
+        * platform/chromium-linux/fast/forms/input-value-expected.png:
+        * platform/chromium-linux/fast/forms/menulist-restrict-line-height-expected.checksum:
+        * platform/chromium-linux/fast/forms/menulist-restrict-line-height-expected.png:
+        * platform/chromium-linux/fast/forms/menulist-style-color-expected.checksum:
+        * platform/chromium-linux/fast/forms/menulist-style-color-expected.png:
+        * platform/chromium-linux/fast/forms/placeholder-position-expected.checksum:
+        * platform/chromium-linux/fast/forms/placeholder-position-expected.png: Added property svn:mime-type.
+        * platform/chromium-linux/fast/forms/radio-attr-order-expected.checksum:
+        * platform/chromium-linux/fast/forms/radio-attr-order-expected.png:
+        * platform/chromium-linux/fast/forms/radio-nested-labels-expected.checksum:
+        * platform/chromium-linux/fast/forms/radio-nested-labels-expected.png:
+        * platform/chromium-linux/fast/forms/radio_checked-expected.checksum:
+        * platform/chromium-linux/fast/forms/radio_checked-expected.png:
+        * platform/chromium-linux/fast/forms/radio_checked_dynamic-expected.checksum:
+        * platform/chromium-linux/fast/forms/radio_checked_dynamic-expected.png:
+        * platform/chromium-linux/fast/forms/select-baseline-expected.checksum:
+        * platform/chromium-linux/fast/forms/select-baseline-expected.png:
+        * platform/chromium-linux/fast/inline/positionedLifetime-expected.checksum:
+        * platform/chromium-linux/fast/inline/positionedLifetime-expected.png:
+        * platform/chromium-linux/fast/parser/bad-xml-slash-expected.checksum:
+        * platform/chromium-linux/fast/parser/bad-xml-slash-expected.png:
+        * platform/chromium-linux/fast/replaced/replaced-breaking-expected.checksum:
+        * platform/chromium-linux/fast/replaced/replaced-breaking-expected.png:
+        * platform/chromium-linux/fast/replaced/width100percent-checkbox-expected.checksum:
+        * platform/chromium-linux/fast/replaced/width100percent-checkbox-expected.png:
+        * platform/chromium-linux/fast/text/textIteratorNilRenderer-expected.checksum:
+        * platform/chromium-linux/fast/text/textIteratorNilRenderer-expected.png:
+        * platform/chromium-linux/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum:
+        * platform/chromium-linux/fast/text/whitespace/normal-after-nowrap-breaking-expected.png:
+        * platform/chromium-linux/tables/mozilla/bugs/bug1318-expected.checksum:
+        * platform/chromium-linux/tables/mozilla/bugs/bug1318-expected.png:
+        * platform/chromium-linux/tables/mozilla/bugs/bug4527-expected.checksum:
+        * platform/chromium-linux/tables/mozilla/bugs/bug4527-expected.png: Added property svn:mime-type.
+        * platform/chromium-linux/tables/mozilla_expected_failures/core/captions1-expected.checksum:
+        * platform/chromium-linux/tables/mozilla_expected_failures/core/captions1-expected.png:
+        * platform/chromium-linux/tables/mozilla_expected_failures/core/captions2-expected.checksum:
+        * platform/chromium-linux/tables/mozilla_expected_failures/core/captions2-expected.png:
+
 2011-01-21  Anton Muhin  <antonm@chromium.org>
 

trunk/LayoutTests/platform/chromium-linux/css1/box_properties/acid_test-expected.checksum

@@ -1 @@
-f353ed60c217c35a9a331a3c0773fd10
+e2b7a88f11dae9aeb36f3cce169928c8

trunk/LayoutTests/platform/chromium-linux/css2.1/t09-c5526c-display-00-e-expected.checksum

@@ -1 @@
-2fcd76111a537a8bc402afaf764042d4
+857651d0098974b32ff32e6a41963329

trunk/LayoutTests/platform/chromium-linux/fast/block/basic/011-expected.checksum

@@ -1 @@
-f353ed60c217c35a9a331a3c0773fd10
+e2b7a88f11dae9aeb36f3cce169928c8

trunk/LayoutTests/platform/chromium-linux/fast/block/margin-collapse/103-expected.checksum

@@ -1 @@
-5a5c6549929cc3fa39916f22943c2770
+0410b6c9859bd433a41bad7aa64ea036

trunk/LayoutTests/platform/chromium-linux/fast/css/non-standard-checkbox-size-expected.checksum

@@ -1 @@
-3561d28f3c41f52aeeed2e2f622547b9
+52b0e66b3d0eff7a6d46e2ef32281587

trunk/LayoutTests/platform/chromium-linux/fast/dom/HTMLProgressElement/progress-element-expected.checksum

@@ -1 @@
-e5e7132bec9d33f172110c570d6b71e5
+cfed1222b4f902ccb8e72d842f3fadda

trunk/LayoutTests/platform/chromium-linux/fast/forms/basic-inputs-expected.checksum

@@ -1 @@
-c7b6401c6e7079364f5919e58fb92db9
+1d5fada71c2e5b1cd49c5c1a958c8584

trunk/LayoutTests/platform/chromium-linux/fast/forms/basic-selects-expected.checksum

@@ -1 @@
-2b77541a31cf118c3c8eaa920088f29f
+ce204fb3c19b6446ff77adc183742f99

trunk/LayoutTests/platform/chromium-linux/fast/forms/box-shadow-override-expected.checksum

@@ -1 @@
-9fc3b723b0cd8b29e2c8ebfb04c387cb
+362963478a1efd5ca5f5405160862234

trunk/LayoutTests/platform/chromium-linux/fast/forms/checkbox-radio-onchange-expected.checksum

@@ -1 @@
-f752be0eadb0fa59942240e722638156
+3839bfb094e16628512a3af82b4c68aa

trunk/LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.checksum

@@ -1 @@
-557a5a3f4aec985594f35b8ba2d70057
+02fe74d68fb55a2fcd55b19a64c24b19

trunk/LayoutTests/platform/chromium-linux/fast/forms/form-element-geometry-expected.checksum

@@ -1 @@
-0d69908f5ab8763f0f963aae021ac024
+b1e3541f696cd7f5f50fce1f0f99ae6e

trunk/LayoutTests/platform/chromium-linux/fast/forms/formmove-expected.checksum

@@ -1 @@
-359f5833ce5b3c2905d45c96a0ca5ed9
+570b7e77a0bf6835f3f2544b1e346552

trunk/LayoutTests/platform/chromium-linux/fast/forms/formmove2-expected.checksum

@@ -1 @@
-418715c09c2aeae02cdcef085c1b287a
+40831efa561b3f0944340035b8493cd2

trunk/LayoutTests/platform/chromium-linux/fast/forms/indeterminate-expected.checksum

@@ -1 @@
-9c47ef09dfc0c8a302fb4bae3dbd4d64
+50b0c5b7834eb76d03388e15441f1c75

trunk/LayoutTests/platform/chromium-linux/fast/forms/input-appearance-height-expected.checksum

@@ -1 @@
-f25d50637130b97a04f9e12fade883b8
+15095e1d75fbcaf5f537730cb68d5b55

trunk/LayoutTests/platform/chromium-linux/fast/forms/input-value-expected.checksum

@@ -1 @@
-e0a2213afe993b7bf86bd0af0bfa00c6
+1f413e36b6dbe6e5894de39a58d498a5

trunk/LayoutTests/platform/chromium-linux/fast/forms/menulist-restrict-line-height-expected.checksum

@@ -1 @@
-74df9a5740e5718a8908df6aa288921b
+274fa379b74af982fa12e009f00d4503

trunk/LayoutTests/platform/chromium-linux/fast/forms/menulist-style-color-expected.checksum

@@ -1 @@
-5f0da1e321c89006a2289df4944d23ca
+665a9dfb63403df20deb6c7bf8a4eebb

trunk/LayoutTests/platform/chromium-linux/fast/forms/placeholder-position-expected.checksum

@@ -1 @@
-138aa1ba63d923cdd5856467663dc5ef
+b7fc7220f4ebdd7dafc197781fff395d

trunk/LayoutTests/platform/chromium-linux/fast/forms/radio-attr-order-expected.checksum

@@ -1 @@
-87cc186fe6e8ba9b768ba8a647b74768
+eff7fbbd6c76ac0db2adc94c34b018c9

trunk/LayoutTests/platform/chromium-linux/fast/forms/radio-nested-labels-expected.checksum

@@ -1 @@
-24273da0f86748b51f877da38ab0ed24
+867dbe0a5e9e6d23a7c0692f0aae80c7

trunk/LayoutTests/platform/chromium-linux/fast/forms/radio_checked-expected.checksum

@@ -1 @@
-3e749a763e9bc3e076248297be2a5789
+5cb65911f1790b06a3297fce62b68483

trunk/LayoutTests/platform/chromium-linux/fast/forms/radio_checked_dynamic-expected.checksum

@@ -1 @@
-5036944b029094bf34e2c442108a37aa
+777f47028bcb9353783784fb53359c58

trunk/LayoutTests/platform/chromium-linux/fast/forms/select-baseline-expected.checksum

@@ -1 @@
-6a546f8f3bfc3a99cbc588aa365c2234
+8c052baa6fc4ac34a4734a43aec827d9

trunk/LayoutTests/platform/chromium-linux/fast/inline/positionedLifetime-expected.checksum

@@ -1 @@
-3db6199505319fd5fe3bb41457f04ec1
+a82cf56bb3d7010e23789b869af3b70e

trunk/LayoutTests/platform/chromium-linux/fast/parser/bad-xml-slash-expected.checksum

@@ -1 @@
-ce8ed31873b1ea6f8526e30802f38152
+b8f56a9b331ae182bb935ca5554e615c

trunk/LayoutTests/platform/chromium-linux/fast/replaced/replaced-breaking-expected.checksum

@@ -1 @@
-9ed3840ae18149dff9148e885ce948f3
+7376d12828febb043bcf2927cd6b8406

trunk/LayoutTests/platform/chromium-linux/fast/replaced/width100percent-checkbox-expected.checksum

@@ -1 @@
-e7c1fdc1853425d70905da9497d90fd3
+75a3ba8f9403784fd7e7ec5a056fe647

trunk/LayoutTests/platform/chromium-linux/fast/text/textIteratorNilRenderer-expected.checksum

@@ -1 @@
-3341f820db3c325c6b5bf82f6795d455
+a7453705b11a9df4a7d3ac8ddfceb9e8

trunk/LayoutTests/platform/chromium-linux/fast/text/whitespace/normal-after-nowrap-breaking-expected.checksum

@@ -1 @@
-0cc1ec175ab05d0f26dd3749ee33263f
+bff1c102f50ffc3a501499137714d950

trunk/LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug1318-expected.checksum

@@ -1 @@
-2e5821c5792313f381653a3bd176553d
+77fc9663503d46d0f6b16df1b8b4515f

trunk/LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug4527-expected.checksum

@@ -1 @@
-917fd36e5fec9e89956f6bcefb061268
+b75cf106d081e9c9515f8ead4d29a556

trunk/LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/core/captions1-expected.checksum

@@ -1 @@
-7eea62dbd4f182701b5e72ec76d35868
+d8159b0237ea43a869ad210b3b1ede15

trunk/LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/core/captions2-expected.checksum

@@ -1 @@
-a90fceb21dc3db04c8ac38a2c1adfbc1
+56f2ab2eb09b07f3ffcb8148aa4daff4

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-21  Xiyuan Xia  <xiyuan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Use WebThemeEngine for relevant RenderTheme parts for chromium/linux.
+        https://bugs.webkit.org/show_bug.cgi?id=52826
+
+        * platform/chromium/ChromiumBridge.h:
+        * rendering/RenderThemeChromiumLinux.cpp:
+        (WebCore::getWebThemeState):
+        (WebCore::RenderThemeChromiumLinux::adjustSliderThumbSize):
+        (WebCore::RenderThemeChromiumLinux::paintCheckbox):
+        (WebCore::RenderThemeChromiumLinux::setCheckboxSize):
+        (WebCore::RenderThemeChromiumLinux::paintRadio):
+        (WebCore::RenderThemeChromiumLinux::setRadioSize):
+        (WebCore::RenderThemeChromiumLinux::paintButton):
+        (WebCore::RenderThemeChromiumLinux::paintTextField):
+        (WebCore::RenderThemeChromiumLinux::paintMenuList):
+        (WebCore::RenderThemeChromiumLinux::paintSliderTrack):
+        (WebCore::RenderThemeChromiumLinux::paintSliderThumb):
+        (WebCore::RenderThemeChromiumLinux::adjustInnerSpinButtonStyle):
+        (WebCore::RenderThemeChromiumLinux::paintInnerSpinButton):
+        (WebCore::RenderThemeChromiumLinux::paintProgressBar):
+        * rendering/RenderThemeChromiumLinux.h:
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::setCheckboxSize):
+        (WebCore::RenderThemeChromiumSkia::setSizeIfAuto):
+        (WebCore::RenderThemeChromiumSkia::indeterminateProgressValueRectFor):
+        * rendering/RenderThemeChromiumSkia.h:
+
 2011-01-21  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/platform/chromium/PlatformBridge.h

@@ -268 +268 @@
     // The UI part which is being accessed.
     enum ThemePart {
+        // ScrollbarTheme parts
         PartScrollbarDownArrow,
         PartScrollbarLeftArrow,
@@ -276 +277 @@
         PartScrollbarHorizontalTrack,
         PartScrollbarVerticalTrack,
+
+        // RenderTheme parts
+        PartCheckbox,
+        PartRadio,
+        PartButton,
+        PartTextField,
+        PartMenuList,
+        PartSliderTrack,
+        PartSliderThumb,
+        PartInnerSpinButton,
+        PartProgressBar
     };
 
@@ -283 +295 @@
         StateHover,
         StateNormal,
-        StatePressed,
+        StatePressed
     };
 
@@ -294 +306 @@
     };
 
+    struct ButtonExtraParams {
+        bool checked;
+        bool indeterminate; // Whether the button state is indeterminate.
+        bool isDefault; // Whether the button is default button.
+        unsigned backgroundColor;
+    };
+
+    struct TextFieldExtraParams {
+        bool isTextArea;
+        bool isListbox;
+        unsigned backgroundColor;
+    };
+
+    struct MenuListExtraParams {
+        int arrowX;
+        int arrowY;
+        unsigned backgroundColor;
+    };
+
+    struct SliderExtraParams {
+        bool vertical;
+        bool inDrag;
+    };
+
+    struct InnerSpinButtonExtraParams {
+        bool spinUp;
+        bool readOnly;
+    };
+
+    struct ProgressBarExtraParams {
+        bool determinate;
+        int valueRectX;
+        int valueRectY;
+        int valueRectWidth;
+        int valueRectHeight;
+    };
+
     union ThemePaintExtraParams {
         ScrollbarTrackExtraParams scrollbarTrack;
+        ButtonExtraParams button;
+        TextFieldExtraParams textField;
+        MenuListExtraParams menuList;
+        SliderExtraParams slider;
+        InnerSpinButtonExtraParams innerSpin;
+        ProgressBarExtraParams progressBar;
     };
 

trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp

@@ -29 +29 @@
 #include "Color.h"
 #include "PaintInfo.h"
-#include "PlatformThemeChromiumGtk.h"
+#include "PlatformBridge.h"
 #include "RenderObject.h"
+#include "RenderProgress.h"
+#include "RenderSlider.h"
 #include "ScrollbarTheme.h"
 #include "UserAgentStyleSheets.h"
@@ -47 +49 @@
 double RenderThemeChromiumLinux::m_caretBlinkInterval;
 
+static const unsigned defaultButtonBackgroundColor = 0xffdddddd;
+
+static PlatformBridge::ThemePaintState getWebThemeState(const RenderTheme* theme, const RenderObject* o)
+{
+    if (!theme->isEnabled(o))
+        return PlatformBridge::StateDisabled;
+    if (theme->isPressed(o))
+        return PlatformBridge::StatePressed;
+    if (theme->isHovered(o))
+        return PlatformBridge::StateHover;
+
+    return PlatformBridge::StateNormal;
+}
+
+
 PassRefPtr<RenderTheme> RenderThemeChromiumLinux::create()
 {
@@ -129 +146 @@
 void RenderThemeChromiumLinux::adjustSliderThumbSize(RenderObject* o) const
 {
-    // These sizes match the sizes in Chromium Win.
-    const int sliderThumbAlongAxis = 11;
-    const int sliderThumbAcrossAxis = 21;
+    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartSliderThumb);
+
     if (o->style()->appearance() == SliderThumbHorizontalPart) {
-        o->style()->setWidth(Length(sliderThumbAlongAxis, Fixed));
-        o->style()->setHeight(Length(sliderThumbAcrossAxis, Fixed));
+        o->style()->setWidth(Length(size.width(), Fixed));
+        o->style()->setHeight(Length(size.height(), Fixed));
     } else if (o->style()->appearance() == SliderThumbVerticalPart) {
-        o->style()->setWidth(Length(sliderThumbAcrossAxis, Fixed));
-        o->style()->setHeight(Length(sliderThumbAlongAxis, Fixed));
+        o->style()->setWidth(Length(size.height(), Fixed));
+        o->style()->setHeight(Length(size.width(), Fixed));
     } else
         RenderThemeChromiumSkia::adjustSliderThumbSize(o);
@@ -169 +185 @@
 }
 
+bool RenderThemeChromiumLinux::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.button.checked = isChecked(o);
+    extraParams.button.indeterminate = isIndeterminate(o);
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartCheckbox, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+void RenderThemeChromiumLinux::setCheckboxSize(RenderStyle* style) const
+{
+    // If the width and height are both specified, then we have nothing to do.
+    if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
+        return;
+
+    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartCheckbox);
+    setSizeIfAuto(style, size);
+}
+
+bool RenderThemeChromiumLinux::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.button.checked = isChecked(o);
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartRadio, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+void RenderThemeChromiumLinux::setRadioSize(RenderStyle* style) const
+{
+    // If the width and height are both specified, then we have nothing to do.
+    if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
+        return;
+
+    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartRadio);
+    setSizeIfAuto(style, size);
+}
+
+bool RenderThemeChromiumLinux::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.button.isDefault = isDefault(o);
+    extraParams.button.backgroundColor = defaultButtonBackgroundColor;
+    if (o->hasBackground())
+        extraParams.button.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartButton, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+bool RenderThemeChromiumLinux::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    // WebThemeEngine does not handle border rounded corner and background image
+    // so return true to draw CSS border and background.
+    if (o->style()->hasBorderRadius() || o->style()->hasBackgroundImage())
+        return true;
+
+    ControlPart part = o->style()->appearance();
+
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.textField.isTextArea = part == TextAreaPart;
+    extraParams.textField.isListbox = part == ListboxPart;
+
+    // Fallback to white if the specified color object is invalid.
+    Color backgroundColor(Color::white);
+    if (o->style()->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
+        backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor);
+    extraParams.textField.backgroundColor = backgroundColor.rgb();
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartTextField, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+bool RenderThemeChromiumLinux::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    const int right = rect.x() + rect.width();
+    const int middle = rect.y() + rect.height() / 2;
+
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.menuList.arrowX = (o->style()->direction() == RTL) ? rect.x() + 7 : right - 13;
+    extraParams.menuList.arrowY = middle;
+    extraParams.menuList.backgroundColor = SkColorSetRGB(0xdd, 0xdd, 0xdd);
+    if (o->hasBackground())
+        extraParams.menuList.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartMenuList, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+bool RenderThemeChromiumLinux::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.slider.vertical = o->style()->appearance() == SliderVerticalPart;
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartSliderTrack, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+bool RenderThemeChromiumLinux::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.slider.vertical = o->style()->appearance() == SliderThumbVerticalPart;
+    extraParams.slider.inDrag = toRenderSlider(o->parent())->inDragMode();
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartSliderThumb, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
 void RenderThemeChromiumLinux::adjustInnerSpinButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
-    int width = ScrollbarTheme::nativeTheme()->scrollbarThickness();
-    style->setWidth(Length(width, Fixed));
-    style->setMinWidth(Length(width, Fixed));
-}
-
-bool RenderThemeChromiumLinux::paintInnerSpinButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    ControlStates northStates = controlStatesForRenderer(object);
-    ControlStates southStates = northStates;
-    if (northStates & SpinUpState)
-        southStates &= ~(HoverState | PressedState);
-    else
-        northStates &= ~(HoverState | PressedState);
-
-    IntRect half = rect;
-    half.setHeight(rect.height() / 2);
-    PlatformThemeChromiumGtk::paintArrowButton(info.context, half, PlatformThemeChromiumGtk::North, northStates);
-
-    half.setY(rect.y() + rect.height() / 2);
-    PlatformThemeChromiumGtk::paintArrowButton(info.context, half, PlatformThemeChromiumGtk::South, southStates);
-    return false;
-}
+    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartInnerSpinButton);
+
+    style->setWidth(Length(size.width(), Fixed));
+    style->setMinWidth(Length(size.width(), Fixed));
+}
+
+bool RenderThemeChromiumLinux::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpState);
+    extraParams.innerSpin.readOnly = isReadOnlyControl(o);
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartInnerSpinButton, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+#if ENABLE(PROGRESS_TAG)
+
+bool RenderThemeChromiumLinux::paintProgressBar(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+{
+    if (!o->isProgress())
+        return true;
+
+    RenderProgress* renderProgress = toRenderProgress(o);
+    IntRect valueRect = progressValueRectFor(renderProgress, rect);
+
+    PlatformBridge::ThemePaintExtraParams extraParams;
+    extraParams.progressBar.determinate = renderProgress->isDeterminate();
+    extraParams.progressBar.valueRectX = valueRect.x();
+    extraParams.progressBar.valueRectY = valueRect.y();
+    extraParams.progressBar.valueRectWidth = valueRect.width();
+    extraParams.progressBar.valueRectHeight = valueRect.height();
+
+    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartProgressBar, getWebThemeState(this, o), rect, &extraParams);
+    return false;
+}
+
+#endif
 
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.h

@@ -60 +60 @@
         virtual double caretBlinkIntervalInternal() const;
 
+        virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&);
+        virtual void setCheckboxSize(RenderStyle*) const;
+
+        virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&);
+        virtual void setRadioSize(RenderStyle*) const;
+
+        virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
+        virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
+        virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
+        virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
+        virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
+
         virtual void adjustInnerSpinButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
         virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
+
+#if ENABLE(PROGRESS_TAG)
+        virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
+#endif
 
         static void setSelectionColors(unsigned activeBackgroundColor,

trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp

@@ -69 +69 @@
 static const float defaultSearchFieldResultsButtonWidth = 18;
 
-static void setSizeIfAuto(RenderStyle* style, const IntSize& size)
-{
-    if (style->width().isIntrinsicOrAuto())
-        style->setWidth(Length(size.width(), Fixed));
-    if (style->height().isAuto())
-        style->setHeight(Length(size.height(), Fixed));
-}
-
-static void drawVertLine(SkCanvas* canvas, int x, int y1, int y2, const SkPaint& paint)
-{
-    SkIRect skrect;
-    skrect.set(x, y1, x + 1, y2 + 1);
-    canvas->drawIRect(skrect, paint);
-}
-
-static void drawHorizLine(SkCanvas* canvas, int x1, int x2, int y, const SkPaint& paint)
-{
-    SkIRect skrect;
-    skrect.set(x1, y, x2 + 1, y + 1);
-    canvas->drawIRect(skrect, paint);
-}
-
-static void drawBox(SkCanvas* canvas, const IntRect& rect, const SkPaint& paint)
-{
-    const int right = rect.x() + rect.width() - 1;
-    const int bottom = rect.y() + rect.height() - 1;
-    drawHorizLine(canvas, rect.x(), right, rect.y(), paint);
-    drawVertLine(canvas, right, rect.y(), bottom, paint);
-    drawHorizLine(canvas, rect.x(), right, bottom, paint);
-    drawVertLine(canvas, rect.x(), rect.y(), bottom, paint);
-}
-
 // We aim to match IE here.
 // -IE uses a font based on the encoding as the default font for form controls.
@@ -238 +206 @@
 }
 
-bool RenderThemeChromiumSkia::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    static Image* const checkedImage = Image::loadPlatformResource("linuxCheckboxOn").releaseRef();
-    static Image* const uncheckedImage = Image::loadPlatformResource("linuxCheckboxOff").releaseRef();
-    static Image* const indeterminateImage = Image::loadPlatformResource("linuxCheckboxIndeterminate").releaseRef();
-    static Image* const disabledCheckedImage = Image::loadPlatformResource("linuxCheckboxDisabledOn").releaseRef();
-    static Image* const disabledUncheckedImage = Image::loadPlatformResource("linuxCheckboxDisabledOff").releaseRef();
-    static Image* const disabledIndeterminateImage = Image::loadPlatformResource("linuxCheckboxDisabledIndeterminate").releaseRef();
-
-    Image* image;
-
-    if (isIndeterminate(o))
-        image = isEnabled(o) ? indeterminateImage : disabledIndeterminateImage;
-    else if (isChecked(o))
-        image = isEnabled(o) ? checkedImage : disabledCheckedImage;
-    else
-        image = isEnabled(o) ? uncheckedImage : disabledUncheckedImage;
-
-    i.context->drawImage(image, o->style()->colorSpace(), center(rect, widgetStandardHeight, widgetStandardWidth));
-    return false;
-}
-
 void RenderThemeChromiumSkia::setCheckboxSize(RenderStyle* style) const
 {
@@ -271 +217 @@
     // DPI.  Until our entire engine honors a DPI setting other than 96, we
     // can't rely on the theme's metrics.
-    const IntSize size(widgetStandardHeight, widgetStandardWidth);
+    const IntSize size(widgetStandardWidth, widgetStandardHeight);
     setSizeIfAuto(style, size);
-}
-
-bool RenderThemeChromiumSkia::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    static Image* const checkedImage = Image::loadPlatformResource("linuxRadioOn").releaseRef();
-    static Image* const uncheckedImage = Image::loadPlatformResource("linuxRadioOff").releaseRef();
-    static Image* const disabledCheckedImage = Image::loadPlatformResource("linuxRadioDisabledOn").releaseRef();
-    static Image* const disabledUncheckedImage = Image::loadPlatformResource("linuxRadioDisabledOff").releaseRef();
-
-    Image* image;
-    if (this->isEnabled(o))
-        image = this->isChecked(o) ? checkedImage : uncheckedImage;
-    else
-        image = this->isChecked(o) ? disabledCheckedImage : disabledUncheckedImage;
-
-    i.context->drawImage(image, o->style()->colorSpace(), center(rect, widgetStandardHeight, widgetStandardWidth));
-    return false;
 }
 
@@ -296 +225 @@
     // Use same sizing for radio box as checkbox.
     setCheckboxSize(style);
-}
-
-static SkColor brightenColor(double h, double s, double l, float brightenAmount)
-{
-    l += brightenAmount;
-    if (l > 1.0)
-        l = 1.0;
-    if (l < 0.0)
-        l = 0.0;
-
-    return makeRGBAFromHSLA(h, s, l, 1.0);
-}
-
-static void paintButtonLike(RenderTheme* theme, RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    SkCanvas* const canvas = i.context->platformContext()->canvas();
-    SkPaint paint;
-    SkRect skrect;
-    const int right = rect.x() + rect.width();
-    const int bottom = rect.y() + rect.height();
-    SkColor baseColor = SkColorSetARGB(0xff, 0xdd, 0xdd, 0xdd);
-    if (o->hasBackground())
-        baseColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
-    double h, s, l;
-    Color(baseColor).getHSL(h, s, l);
-    // Our standard gradient is from 0xdd to 0xf8. This is the amount of
-    // increased luminance between those values.
-    SkColor lightColor(brightenColor(h, s, l, 0.105));
-
-    // If the button is too small, fallback to drawing a single, solid color
-    if (rect.width() < 5 || rect.height() < 5) {
-        paint.setColor(baseColor);
-        skrect.set(rect.x(), rect.y(), right, bottom);
-        canvas->drawRect(skrect, paint);
-        return;
-    }
-
-    const int borderAlpha = theme->isHovered(o) ? 0x80 : 0x55;
-    paint.setARGB(borderAlpha, 0, 0, 0);
-    canvas->drawLine(rect.x() + 1, rect.y(), right - 1, rect.y(), paint);
-    canvas->drawLine(right - 1, rect.y() + 1, right - 1, bottom - 1, paint);
-    canvas->drawLine(rect.x() + 1, bottom - 1, right - 1, bottom - 1, paint);
-    canvas->drawLine(rect.x(), rect.y() + 1, rect.x(), bottom - 1, paint);
-
-    paint.setColor(SK_ColorBLACK);
-    SkPoint p[2];
-    const int lightEnd = theme->isPressed(o) ? 1 : 0;
-    const int darkEnd = !lightEnd;
-    p[lightEnd].set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()));
-    p[darkEnd].set(SkIntToScalar(rect.x()), SkIntToScalar(bottom - 1));
-    SkColor colors[2];
-    colors[0] = lightColor;
-    colors[1] = baseColor;
-
-    SkShader* shader = SkGradientShader::CreateLinear(
-        p, colors, NULL, 2, SkShader::kClamp_TileMode, NULL);
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setShader(shader);
-    shader->unref();
-
-    skrect.set(rect.x() + 1, rect.y() + 1, right - 1, bottom - 1);
-    canvas->drawRect(skrect, paint);
-
-    paint.setShader(NULL);
-    paint.setColor(brightenColor(h, s, l, -0.0588));
-    canvas->drawPoint(rect.x() + 1, rect.y() + 1, paint);
-    canvas->drawPoint(right - 2, rect.y() + 1, paint);
-    canvas->drawPoint(rect.x() + 1, bottom - 2, paint);
-    canvas->drawPoint(right - 2, bottom - 2, paint);
-}
-
-bool RenderThemeChromiumSkia::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    paintButtonLike(this, o, i, rect);
-    return false;
 }
 
@@ -379 +233 @@
         style->setLineHeight(RenderStyle::initialLineHeight());
     }
-}
-
-
-bool RenderThemeChromiumSkia::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    return true;
 }
 
@@ -623 +471 @@
 }
 
-bool RenderThemeChromiumSkia::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    SkCanvas* const canvas = i.context->platformContext()->canvas();
-    const int right = rect.x() + rect.width();
-    const int middle = rect.y() + rect.height() / 2;
-
-    paintButtonLike(this, o, i, rect);
-
-    SkPaint paint;
-    paint.setColor(SK_ColorBLACK);
-    paint.setAntiAlias(true);
-    paint.setStyle(SkPaint::kFill_Style);
-
-    int arrowXPosition = (o->style()->direction() == RTL) ? rect.x() + 7 : right - 13;
-    SkPath path;
-    path.moveTo(arrowXPosition, middle - 3);
-    path.rLineTo(6, 0);
-    path.rLineTo(-3, 6);
-    path.close();
-    canvas->drawPath(path, paint);
-
-    return false;
-}
-
 void RenderThemeChromiumSkia::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
@@ -658 +482 @@
 }
 
-bool RenderThemeChromiumSkia::paintSliderTrack(RenderObject*, const PaintInfo& i, const IntRect& rect)
-{
-    // Just paint a grey box for now (matches the color of a scrollbar background.
-    SkCanvas* const canvas = i.context->platformContext()->canvas();
-    int verticalCenter = rect.y() + rect.height() / 2;
-    int top = std::max(rect.y(), verticalCenter - 2);
-    int bottom = std::min(rect.y() + rect.height(), verticalCenter + 2);
-
-    SkPaint paint;
-    const SkColor grey = SkColorSetARGB(0xff, 0xe3, 0xdd, 0xd8);
-    paint.setColor(grey);
-
-    SkRect skrect;
-    skrect.set(rect.x(), top, rect.x() + rect.width(), bottom);
-    canvas->drawRect(skrect, paint);
-
-    return false;
-}
-
-bool RenderThemeChromiumSkia::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    // Make a thumb similar to the scrollbar thumb.
-    const bool hovered = isHovered(o) || toRenderSlider(o->parent())->inDragMode();
-    const int midx = rect.x() + rect.width() / 2;
-    const int midy = rect.y() + rect.height() / 2;
-    const bool vertical = (o->style()->appearance() == SliderThumbVerticalPart);
-    SkCanvas* const canvas = i.context->platformContext()->canvas();
-
-    const SkColor thumbLightGrey = SkColorSetARGB(0xff, 0xf4, 0xf2, 0xef);
-    const SkColor thumbDarkGrey = SkColorSetARGB(0xff, 0xea, 0xe5, 0xe0);
-    SkPaint paint;
-    paint.setColor(hovered ? SK_ColorWHITE : thumbLightGrey);
-
-    SkIRect skrect;
-    if (vertical)
-        skrect.set(rect.x(), rect.y(), midx + 1, rect.bottom());
-    else
-        skrect.set(rect.x(), rect.y(), rect.right(), midy + 1);
-
-    canvas->drawIRect(skrect, paint);
-
-    paint.setColor(hovered ? thumbLightGrey : thumbDarkGrey);
-
-    if (vertical)
-        skrect.set(midx + 1, rect.y(), rect.right(), rect.bottom());
-    else
-        skrect.set(rect.x(), midy + 1, rect.right(), rect.bottom());
-
-    canvas->drawIRect(skrect, paint);
-
-    const SkColor borderDarkGrey = SkColorSetARGB(0xff, 0x9d, 0x96, 0x8e);
-    paint.setColor(borderDarkGrey);
-    drawBox(canvas, rect, paint);
-
-    if (rect.height() > 10 && rect.width() > 10) {
-        drawHorizLine(canvas, midx - 2, midx + 2, midy, paint);
-        drawHorizLine(canvas, midx - 2, midx + 2, midy - 3, paint);
-        drawHorizLine(canvas, midx - 2, midx + 2, midy + 3, paint);
-    }
-
-    return false;
-}
-
 int RenderThemeChromiumSkia::popupInternalPaddingLeft(RenderStyle* style) const
 {
@@ -757 +518 @@
 {
     return RenderTheme::caretBlinkInterval();
+}
+
+// static
+void RenderThemeChromiumSkia::setSizeIfAuto(RenderStyle* style, const IntSize& size)
+{
+    if (style->width().isIntrinsicOrAuto())
+        style->setWidth(Length(size.width(), Fixed));
+    if (style->height().isAuto())
+        style->setHeight(Length(size.height(), Fixed));
 }
 
@@ -802 +572 @@
     if (movableWidth <= 0)
         return IntRect();
-    
+
     double progress = renderProgress->animationProgress();
     if (progress < 0.5)
@@ -819 +589 @@
 }
 
-bool RenderThemeChromiumSkia::paintProgressBar(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    static Image* barImage = Image::loadPlatformResource("linuxProgressBar").releaseRef();
-    static Image* valueImage = Image::loadPlatformResource("linuxProgressValue").releaseRef();
-    static Image* leftBorderImage = Image::loadPlatformResource("linuxProgressBorderLeft").releaseRef();
-    static Image* rightBorderImage = Image::loadPlatformResource("linuxProgressBorderRight").releaseRef();
-    ASSERT(barImage->height() == valueImage->height());
-
-    if (!renderObject->isProgress())
-        return true;
-
-    paintInfo.context->platformContext()->setImageResamplingHint(barImage->size(), rect.size());
-
-    RenderProgress* renderProgress = toRenderProgress(renderObject);
-    double tileScale = static_cast<double>(rect.height()) / barImage->height();
-    IntSize barTileSize(static_cast<int>(barImage->width() * tileScale), rect.height());
-    ColorSpace colorSpace = renderObject->style()->colorSpace();
-
-    paintInfo.context->drawTiledImage(barImage, colorSpace, rect, IntPoint(0, 0), barTileSize);
-
-    IntRect valueRect = progressValueRectFor(renderProgress, rect);
-    if (valueRect.width()) {
-
-        IntSize valueTileSize(std::max(1, static_cast<int>(valueImage->width() * tileScale)), valueRect.height());
-
-        int leftOffset = valueRect.x() - rect.x();
-        int roundedLeftOffset= (leftOffset / valueTileSize.width()) * valueTileSize.width();
-        int dstLeftValueWidth = roundedLeftOffset - leftOffset + (leftOffset % valueImage->width()) ? valueTileSize.width() : 0;
-
-        IntRect dstLeftValueRect(valueRect.x(), valueRect.y(), dstLeftValueWidth, valueRect.height());
-        int srcLeftValueWidth = dstLeftValueWidth / tileScale;
-        IntRect srcLeftValueRect(valueImage->width() - srcLeftValueWidth, 0, srcLeftValueWidth, valueImage->height());
-        paintInfo.context->drawImage(valueImage, colorSpace, dstLeftValueRect, srcLeftValueRect);
-
-        int rightOffset = valueRect.right() - rect.x();
-        int roundedRightOffset = (rightOffset / valueTileSize.width()) * valueTileSize.width();
-        int dstRightValueWidth = rightOffset - roundedRightOffset;
-        IntRect dstRightValueRect(rect.x() + roundedRightOffset, valueRect.y(), dstRightValueWidth, valueTileSize.height());
-        int srcRightValueWidth = dstRightValueWidth / tileScale;
-        IntRect srcRightValueRect(0, 0, srcRightValueWidth, valueImage->height());
-        paintInfo.context->drawImage(valueImage, colorSpace, dstRightValueRect, srcRightValueRect);
-        
-        IntRect alignedValueRect(dstLeftValueRect.right(), dstLeftValueRect.y(), 
-                                 dstRightValueRect.x() - dstLeftValueRect.right(), dstLeftValueRect.height());
-        paintInfo.context->drawTiledImage(valueImage, colorSpace, alignedValueRect, IntPoint(0, 0), valueTileSize);
-    }
-
-    int dstLeftBorderWidth = leftBorderImage->width() * tileScale;
-    IntRect dstLeftBorderRect(rect.x(), rect.y(), dstLeftBorderWidth, rect.height());
-    paintInfo.context->drawImage(leftBorderImage, colorSpace, dstLeftBorderRect, leftBorderImage->rect());
-
-    int dstRightBorderWidth = rightBorderImage->width() * tileScale;
-    IntRect dstRightBorderRect(rect.right() - dstRightBorderWidth, rect.y(), dstRightBorderWidth, rect.height());
-    paintInfo.context->drawImage(rightBorderImage, colorSpace, dstRightBorderRect, rightBorderImage->rect());
-
-    paintInfo.context->platformContext()->clearImageResamplingHint();
-
-    return false;
-}
-
-
 IntRect RenderThemeChromiumSkia::progressValueRectFor(RenderProgress* renderProgress, const IntRect& rect) const
 {

trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h

@@ -35 +35 @@
 class RenderProgress;
 
-    class RenderThemeChromiumSkia : public RenderTheme {
+class RenderThemeChromiumSkia : public RenderTheme {
     public:
         RenderThemeChromiumSkia();
@@ -67 +67 @@
         virtual int minimumMenuListSize(RenderStyle*) const;
 
-        virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&);
         virtual void setCheckboxSize(RenderStyle*) const;
 
-        virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&);
         virtual void setRadioSize(RenderStyle*) const;
 
-        virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
         virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
-
-        virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
 
         virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&);
@@ -113 +108 @@
         // entire menulist.
         virtual void adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
-        virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
         virtual void adjustMenuListButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
         virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
-
-        virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
-        virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
 
 #if ENABLE(PROGRESS_TAG)
         virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
         virtual double animationDurationForProgressBar(RenderProgress*) const;
-        virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
 #endif
 
@@ -154 +144 @@
         virtual double caretBlinkIntervalInternal() const;
 
+        static void setSizeIfAuto(RenderStyle*, const IntSize&);
+
 #if ENABLE(PROGRESS_TAG)
         IntRect determinateProgressValueRectFor(RenderProgress*, const IntRect&) const;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-21  Xiyuan Xia  <xiyuan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Use WebThemeEngine for relevant RenderTheme parts for chromium/linux.
+        https://bugs.webkit.org/show_bug.cgi?id=52826
+
+        * WebKit.gyp:
+        * src/ChromiumBridge.cpp:
+        (WebCore::WebThemePart):
+        (WebCore::GetWebThemeExtraParams):
+
 2011-01-21  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -953 +953 @@
                                 'repack_path': '<(chromium_src_dir)/tools/data_pack/repack.py',
                                 'pak_inputs': [
+                                    '<(SHARED_INTERMEDIATE_DIR)/gfx/gfx_resources.pak',
                                     '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                                     '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',

trunk/Source/WebKit/chromium/src/PlatformBridge.cpp

@@ -792 +792 @@
     case PlatformBridge::PartScrollbarHorizontalTrack: return WebThemeEngine::PartScrollbarHorizontalTrack;
     case PlatformBridge::PartScrollbarVerticalTrack: return WebThemeEngine::PartScrollbarVerticalTrack;
+    case PlatformBridge::PartCheckbox: return WebThemeEngine::PartCheckbox;
+    case PlatformBridge::PartRadio: return WebThemeEngine::PartRadio;
+    case PlatformBridge::PartButton: return WebThemeEngine::PartButton;
+    case PlatformBridge::PartTextField: return WebThemeEngine::PartTextField;
+    case PlatformBridge::PartMenuList: return WebThemeEngine::PartMenuList;
+    case PlatformBridge::PartSliderTrack: return WebThemeEngine::PartSliderTrack;
+    case PlatformBridge::PartSliderThumb: return WebThemeEngine::PartSliderThumb;
+    case PlatformBridge::PartInnerSpinButton: return WebThemeEngine::PartInnerSpinButton;
+    case PlatformBridge::PartProgressBar: return WebThemeEngine::PartProgressBar;
     }
     ASSERT_NOT_REACHED();
@@ -811 +820 @@
 static void GetWebThemeExtraParams(PlatformBridge::ThemePart part, PlatformBridge::ThemePaintState state, const PlatformBridge::ThemePaintExtraParams* extraParams, WebThemeEngine::ExtraParams* webThemeExtraParams)
 {
-    if (part == PlatformBridge::PartScrollbarHorizontalTrack || part == PlatformBridge::PartScrollbarVerticalTrack) {
+    switch (part) {
+    case PlatformBridge::PartScrollbarHorizontalTrack:
+    case PlatformBridge::PartScrollbarVerticalTrack:
         webThemeExtraParams->scrollbarTrack.trackX = extraParams->scrollbarTrack.trackX;
         webThemeExtraParams->scrollbarTrack.trackY = extraParams->scrollbarTrack.trackY;
         webThemeExtraParams->scrollbarTrack.trackWidth = extraParams->scrollbarTrack.trackWidth;
         webThemeExtraParams->scrollbarTrack.trackHeight = extraParams->scrollbarTrack.trackHeight;
+        break;
+    case PlatformBridge::PartCheckbox:
+        webThemeExtraParams->button.checked = extraParams->button.checked;
+        webThemeExtraParams->button.indeterminate = extraParams->button.indeterminate;
+        break;
+    case PlatformBridge::PartRadio:
+        webThemeExtraParams->button.checked = extraParams->button.checked;
+        break;
+    case PlatformBridge::PartButton:
+        webThemeExtraParams->button.isDefault = extraParams->button.isDefault;
+        webThemeExtraParams->button.backgroundColor = extraParams->button.backgroundColor;
+        break;
+    case PlatformBridge::PartTextField:
+        webThemeExtraParams->textField.isTextArea = extraParams->textField.isTextArea;
+        webThemeExtraParams->textField.isListbox = extraParams->textField.isListbox;
+        webThemeExtraParams->textField.backgroundColor = extraParams->textField.backgroundColor;
+        break;
+    case PlatformBridge::PartMenuList:
+        webThemeExtraParams->menuList.arrowX = extraParams->menuList.arrowX;
+        webThemeExtraParams->menuList.arrowY = extraParams->menuList.arrowY;
+        webThemeExtraParams->menuList.backgroundColor = extraParams->menuList.backgroundColor;
+        break;
+    case PlatformBridge::PartSliderTrack:
+    case PlatformBridge::PartSliderThumb:
+        webThemeExtraParams->slider.vertical = extraParams->slider.vertical;
+        webThemeExtraParams->slider.inDrag = extraParams->slider.inDrag;
+        break;
+    case PlatformBridge::PartInnerSpinButton:
+        webThemeExtraParams->innerSpin.spinUp = extraParams->innerSpin.spinUp;
+        webThemeExtraParams->innerSpin.readOnly = extraParams->innerSpin.readOnly;
+        break;
+    case PlatformBridge::PartProgressBar:
+        webThemeExtraParams->progressBar.determinate = extraParams->progressBar.determinate;
+        webThemeExtraParams->progressBar.valueRectX = extraParams->progressBar.valueRectX;
+        webThemeExtraParams->progressBar.valueRectY = extraParams->progressBar.valueRectY;
+        webThemeExtraParams->progressBar.valueRectWidth = extraParams->progressBar.valueRectWidth;
+        webThemeExtraParams->progressBar.valueRectHeight = extraParams->progressBar.valueRectHeight;
+        break;
+    default:
+        break; // Parts that have no extra params get here.
     }
 }