[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 14:27:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 808a8f2a7be26bd4c59105bbc05f7f222d8cd260
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 9 01:58:05 2010 +0000
2010-10-08 Martin Robinson <mrobinson at igalia.com>
Reviewed by Daniel Bates.
[GTK] Fails /LayoutTests/fast/css/button-height.html
https://bugs.webkit.org/show_bug.cgi?id=33936
Unskip a test that is now passing and update baselines for
other tests.
* platform/gtk/Skipped: Update skipped list.
* platform/gtk/fast/forms/box-shadow-override-expected.txt:
* platform/gtk/fast/forms/button-style-color-expected.txt:
* platform/gtk/fast/forms/input-button-sizes-expected.txt:
2010-10-08 Martin Robinson <mrobinson at igalia.com>
Reviewed by Daniel Bates.
[GTK] Fails /LayoutTests/fast/css/button-height.html
https://bugs.webkit.org/show_bug.cgi?id=33936
GTK buttons honor height property set via CSS. The code for the method
adjustButtonStyle originates from the original GTK+ theme drawing code
and is clearly just a copy-paste from the Safari theme drawing code. The
Safari theme drawing code does quite a bit of work to ensure that button
fonts are consistent with the system theme, which is not something the GTK+
port does.
This change brings the method more in line with the Chromium port, which
allows CSS to style buttons, only overriding the line-height property,
which is required for layout tests to pass.
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::adjustButtonStyle): No longer override most CSS
properties for button styling.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 37b144d..78f32d5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-08 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Daniel Bates.
+
+ [GTK] Fails /LayoutTests/fast/css/button-height.html
+ https://bugs.webkit.org/show_bug.cgi?id=33936
+
+ Unskip a test that is now passing and update baselines for
+ other tests.
+
+ * platform/gtk/Skipped: Update skipped list.
+ * platform/gtk/fast/forms/box-shadow-override-expected.txt:
+ * platform/gtk/fast/forms/button-style-color-expected.txt:
+ * platform/gtk/fast/forms/input-button-sizes-expected.txt:
+
2010-10-08 Albert J. Wong <ajwong at chromium.org>
[Unrevied] Chromium build fix.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index ff881f6..6bf7c92 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5014,14 +5014,6 @@ svg/filters/subRegion-in-userSpace.svg
# ------------------
# Tests with bugs attached : Enable these tests again once these bugs are fixed.
# ------------------
-
-# Height not honored for <input> and <button> elements.
-# See Bug #33936 - https://bugs.webkit.org/show_bug.cgi?id=33936
-fast/css/button-height.html
-# I think this is related. Essentially we aren't honoring style
-# information for widgets.
-fast/forms/textarea-metrics.html
-
# See Bug #27905 - http://bugs.webkit.org/show_bug.cgi?id=27905
# Missing resource load callback ability in DRT
http/tests/loading/redirect-methods.html
@@ -5669,6 +5661,7 @@ canvas/philip/tests/toDataURL.jpeg.quality.basic.html
# on form elements: https://bugs.webkit.org/show_bug.cgi?id=40855
fast/forms/basic-selects.html
fast/forms/basic-textareas-quirks.html
+fast/forms/textarea-metrics.html
# Fake italics do not work: https://bugs.webkit.org/show_bug.cgi?id=40856
fast/text/fake-italic.html
diff --git a/LayoutTests/platform/gtk/fast/forms/box-shadow-override-expected.txt b/LayoutTests/platform/gtk/fast/forms/box-shadow-override-expected.txt
index 7a7cc94..f875d51 100644
--- a/LayoutTests/platform/gtk/fast/forms/box-shadow-override-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/box-shadow-override-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (0,1) size 14x14
RenderBlock {DIV} at (148,1) size 14x14
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,157) size 784x35
+ RenderBlock (anonymous) at (0,157) size 784x36
RenderBlock {INPUT} at (4,11) size 15x15
RenderText {#text} at (23,9) size 4x19
text run at (23,9) width 4: " "
@@ -38,33 +38,33 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (49,0) size 31x14
RenderText {#text} at (187,9) size 4x19
text run at (187,9) width 4: " "
- RenderFileUploadControl {INPUT} at (193,5) size 272x27 "(None)"
- RenderButton {INPUT} at (0,0) size 89x27 [bgcolor=#C0C0C0]
+ RenderFileUploadControl {INPUT} at (193,5) size 272x28 "(None)"
+ RenderButton {INPUT} at (0,0) size 89x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 73x19
RenderText at (0,0) size 73x19
text run at (0,0) width 73: "Choose File"
RenderText {#text} at (467,9) size 4x19
text run at (467,9) width 4: " "
- RenderButton {INPUT} at (473,2) size 67x31 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (473,2) size 67x32 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 51x23
RenderText at (0,0) size 51x23
text run at (0,0) width 51: "Button"
RenderText {#text} at (542,9) size 4x19
text run at (542,9) width 4: " "
- RenderButton {INPUT} at (548,5) size 56x27 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (548,5) size 56x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 40x19
RenderText at (0,0) size 40x19
text run at (0,0) width 40: "Button"
RenderText {#text} at (606,9) size 4x19
text run at (606,9) width 4: " "
- RenderButton {INPUT} at (610,15) size 30x15 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (610,15) size 30x16 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 14x7
RenderText at (0,0) size 14x7
text run at (0,0) width 14: "Button"
RenderText {#text} at (640,9) size 4x19
text run at (640,9) width 4: " "
- RenderButton {BUTTON} at (646,4) size 67x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,2) size 51x23
+ RenderButton {BUTTON} at (646,2) size 67x32 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,4) size 51x23
RenderText {#text} at (0,0) size 51x23
text run at (0,0) width 51: "Button"
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/button-style-color-expected.txt b/LayoutTests/platform/gtk/fast/forms/button-style-color-expected.txt
index a668304..9ff83e6 100644
--- a/LayoutTests/platform/gtk/fast/forms/button-style-color-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/button-style-color-expected.txt
@@ -3,14 +3,14 @@ layer 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
- RenderButton {BUTTON} at (2,4) size 86x24 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,2) size 70x19
+ RenderButton {BUTTON} at (2,2) size 86x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,4) size 70x19
RenderText {#text} at (0,0) size 70x19
text run at (0,0) width 70: "Test Button"
RenderText {#text} at (90,6) size 4x19
text run at (90,6) width 4: " "
- RenderButton {BUTTON} at (96,4) size 86x24 [color=#FF0000] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,2) size 70x19
+ RenderButton {BUTTON} at (96,2) size 86x28 [color=#FF0000] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,4) size 70x19
RenderText {#text} at (0,0) size 70x19
text run at (0,0) width 70: "Test Button"
RenderText {#text} at (184,6) size 4x19
@@ -27,13 +27,13 @@ layer at (0,0) size 800x600
text run at (0,0) width 70: "Test Button"
RenderText {#text} at (372,6) size 4x19
text run at (372,6) width 4: " "
- RenderButton {INPUT} at (378,2) size 86x27 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (378,2) size 86x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 70x19
RenderText at (0,0) size 70x19
text run at (0,0) width 70: "Test Button"
RenderText {#text} at (466,6) size 4x19
text run at (466,6) width 4: " "
- RenderButton {INPUT} at (472,2) size 86x27 [color=#FF0000] [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (472,2) size 86x28 [color=#FF0000] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 70x19
RenderText at (0,0) size 70x19
text run at (0,0) width 70: "Test Button"
diff --git a/LayoutTests/platform/gtk/fast/forms/input-button-sizes-expected.txt b/LayoutTests/platform/gtk/fast/forms/input-button-sizes-expected.txt
index 241cb4f..7b4db9d 100644
--- a/LayoutTests/platform/gtk/fast/forms/input-button-sizes-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/input-button-sizes-expected.txt
@@ -3,103 +3,103 @@ layer 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
- RenderButton {INPUT} at (0,11) size 39x15 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (0,11) size 39x16 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 23x7
RenderText at (0,0) size 23x7
text run at (0,0) width 23: "Test Button"
RenderText {#text} at (39,5) size 4x19
text run at (39,5) width 4: " "
- RenderButton {INPUT} at (43,10) size 46x16 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (43,10) size 46x17 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 30x8
RenderText at (0,0) size 30x8
text run at (0,0) width 30: "Test Button"
RenderText {#text} at (89,5) size 4x19
text run at (89,5) width 4: " "
- RenderButton {INPUT} at (93,9) size 51x17 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (93,9) size 51x18 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 35x9
RenderText at (0,0) size 35x9
text run at (0,0) width 35: "Test Button"
RenderText {#text} at (144,5) size 4x19
text run at (144,5) width 4: " "
- RenderButton {INPUT} at (148,8) size 53x18 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (148,8) size 53x19 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 37x10
RenderText at (0,0) size 37x10
text run at (0,0) width 37: "Test Button"
RenderText {#text} at (201,5) size 4x19
text run at (201,5) width 4: " "
- RenderButton {INPUT} at (205,7) size 61x19 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (205,7) size 61x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 45x11
RenderText at (0,0) size 45x11
text run at (0,0) width 45: "Test Button"
RenderText {#text} at (266,5) size 4x19
text run at (266,5) width 4: " "
- RenderButton {INPUT} at (270,7) size 65x20 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (270,7) size 65x21 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 49x12
RenderText at (0,0) size 49x12
text run at (0,0) width 49: "Test Button"
RenderText {#text} at (335,5) size 4x19
text run at (335,5) width 4: " "
- RenderButton {INPUT} at (341,6) size 72x21 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (341,6) size 72x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 56x13
RenderText at (0,0) size 56x13
text run at (0,0) width 56: "Test Button"
RenderText {#text} at (415,5) size 4x19
text run at (415,5) width 4: " "
- RenderButton {INPUT} at (421,5) size 75x22 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (421,5) size 75x23 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 59x14
RenderText at (0,0) size 59x14
text run at (0,0) width 59: "Test Button"
RenderText {#text} at (498,5) size 4x19
text run at (498,5) width 4: " "
- RenderButton {INPUT} at (504,4) size 80x23 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (504,4) size 80x24 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 64x15
RenderText at (0,0) size 64x15
text run at (0,0) width 64: "Test Button"
RenderText {#text} at (586,5) size 4x19
text run at (586,5) width 4: " "
- RenderButton {INPUT} at (592,3) size 82x25 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (592,3) size 82x26 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 66x17
RenderText at (0,0) size 66x17
text run at (0,0) width 66: "Test Button"
RenderText {#text} at (676,5) size 4x19
text run at (676,5) width 4: " "
- RenderButton {INPUT} at (682,2) size 85x26 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (682,2) size 85x27 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 69x18
RenderText at (0,0) size 69x18
text run at (0,0) width 69: "Test Button"
RenderText {#text} at (769,5) size 4x19
text run at (769,5) width 4: " "
- RenderButton {INPUT} at (2,36) size 86x27 [bgcolor=#C0C0C0]
+ RenderButton {INPUT} at (2,37) size 86x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 70x19
RenderText at (0,0) size 70x19
text run at (0,0) width 70: "Test Button"
- RenderText {#text} at (90,40) size 4x19
- text run at (90,40) width 4: " "
- RenderButton {INPUT} at (96,35) size 95x28 [bgcolor=#C0C0C0]
+ RenderText {#text} at (90,41) size 4x19
+ text run at (90,41) width 4: " "
+ RenderButton {INPUT} at (96,36) size 95x29 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 79x20
RenderText at (0,0) size 79x20
text run at (0,0) width 79: "Test Button"
- RenderText {#text} at (193,40) size 4x19
- text run at (193,40) width 4: " "
- RenderButton {INPUT} at (199,34) size 102x29 [bgcolor=#C0C0C0]
+ RenderText {#text} at (193,41) size 4x19
+ text run at (193,41) width 4: " "
+ RenderButton {INPUT} at (199,35) size 102x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 86x21
RenderText at (0,0) size 86x21
text run at (0,0) width 86: "Test Button"
- RenderText {#text} at (303,40) size 4x19
- text run at (303,40) width 4: " "
- RenderButton {INPUT} at (309,34) size 104x30 [bgcolor=#C0C0C0]
+ RenderText {#text} at (303,41) size 4x19
+ text run at (303,41) width 4: " "
+ RenderButton {INPUT} at (309,35) size 104x31 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 88x22
RenderText at (0,0) size 88x22
text run at (0,0) width 88: "Test Button"
- RenderText {#text} at (415,40) size 4x19
- text run at (415,40) width 4: " "
- RenderButton {INPUT} at (421,33) size 106x31 [bgcolor=#C0C0C0]
+ RenderText {#text} at (415,41) size 4x19
+ text run at (415,41) width 4: " "
+ RenderButton {INPUT} at (421,34) size 106x32 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 90x23
RenderText at (0,0) size 90x23
text run at (0,0) width 90: "Test Button"
- RenderText {#text} at (529,40) size 4x19
- text run at (529,40) width 4: " "
- RenderButton {INPUT} at (535,32) size 114x32 [bgcolor=#C0C0C0]
+ RenderText {#text} at (529,41) size 4x19
+ text run at (529,41) width 4: " "
+ RenderButton {INPUT} at (535,33) size 114x33 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 98x24
RenderText at (0,0) size 98x24
text run at (0,0) width 98: "Test Button"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4c4f8b8..94debae 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-10-08 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Daniel Bates.
+
+ [GTK] Fails /LayoutTests/fast/css/button-height.html
+ https://bugs.webkit.org/show_bug.cgi?id=33936
+
+ GTK buttons honor height property set via CSS. The code for the method
+ adjustButtonStyle originates from the original GTK+ theme drawing code
+ and is clearly just a copy-paste from the Safari theme drawing code. The
+ Safari theme drawing code does quite a bit of work to ensure that button
+ fonts are consistent with the system theme, which is not something the GTK+
+ port does.
+
+ This change brings the method more in line with the Chromium port, which
+ allows CSS to style buttons, only overriding the line-height property,
+ which is required for layout tests to pass.
+
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::adjustButtonStyle): No longer override most CSS
+ properties for button styling.
+
2010-10-08 Mihai Parparita <mihaip at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/platform/gtk/RenderThemeGtk.cpp b/WebCore/platform/gtk/RenderThemeGtk.cpp
index 887cbea..1039e42 100644
--- a/WebCore/platform/gtk/RenderThemeGtk.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -380,16 +380,6 @@ bool RenderThemeGtk::paintRenderObject(GtkThemeWidgetType type, RenderObject* re
return paintMozillaGtkWidget(type, context, rect, &widgetState, flags, textDirection);
}
-static void setButtonPadding(RenderStyle* style)
-{
- // FIXME: This looks incorrect.
- const int padding = 8;
- style->setPaddingLeft(Length(padding, Fixed));
- style->setPaddingRight(Length(padding, Fixed));
- style->setPaddingTop(Length(padding / 2, Fixed));
- style->setPaddingBottom(Length(padding / 2, Fixed));
-}
-
static void setToggleSize(const RenderThemeGtk* theme, RenderStyle* style, ControlPart appearance)
{
// The width and height are both specified, so we shouldn't change them.
@@ -444,18 +434,9 @@ bool RenderThemeGtk::paintRadio(RenderObject* o, const PaintInfo& i, const IntRe
void RenderThemeGtk::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
{
- // FIXME: Is this condition necessary?
- if (style->appearance() == PushButtonPart) {
- style->resetBorder();
- style->setHeight(Length(Auto));
- style->setWhiteSpace(PRE);
- setButtonPadding(style);
- } else {
- // FIXME: This should not be hard-coded.
- style->setMinHeight(Length(14, Fixed));
- style->resetBorderTop();
- style->resetBorderBottom();
- }
+ // Some layout tests check explicitly that buttons ignore line-height.
+ if (style->appearance() == PushButtonPart)
+ style->setLineHeight(RenderStyle::initialLineHeight());
}
bool RenderThemeGtk::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list