diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 98a01a1c486c4b977e6acf23f7c352d87f002e77..aaef6476e73adc9284077c45197d1cd0eaa2366d 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,19 @@ +2009-07-30 Mike Fenton + + Reviewed by Adam Treat. + + Add Button Colour style test and results for Qt based upon fix for bug. + Unskip tables/mozilla/bugs/bug92647-2.html which passes with bug fix. + Update expected results for qt for test fast/dom/HTMLTableColElement/resize-table-using-col-width-expected + which also passes with the the bug fix. + + https://bugs.webkit.org/show_bug.cgi?id=27814 + + * fast/forms/button-style-color.html: Added. + * platform/qt/Skipped: + * platform/qt/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.txt: + * platform/qt/fast/forms/button-style-color-expected.txt: Added. + 2009-07-30 Eric Carlson Reviewed by Simon Fraser. diff --git a/LayoutTests/fast/forms/button-style-color.html b/LayoutTests/fast/forms/button-style-color.html new file mode 100644 index 0000000000000000000000000000000000000000..526bffe43af4952712987ed9208f3d4a87d7b3d8 --- /dev/null +++ b/LayoutTests/fast/forms/button-style-color.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped index 67637f3bea5539a012760911624bb6644a85c9b9..7eef2f6d75e3017dcfc9a4044e5de62400837367 100644 --- a/LayoutTests/platform/qt/Skipped +++ b/LayoutTests/platform/qt/Skipped @@ -4424,7 +4424,6 @@ tables/mozilla/bugs/bug9072.html tables/mozilla/bugs/bug9123-1.html tables/mozilla/bugs/bug9123-2.html tables/mozilla/bugs/bug92143.html -tables/mozilla/bugs/bug92647-2.html tables/mozilla/bugs/bug9271-1.html tables/mozilla/bugs/bug9271-2.html tables/mozilla/bugs/bug92868.html diff --git a/LayoutTests/platform/qt/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.txt b/LayoutTests/platform/qt/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.txt index 17a1d57fc37718f8aa7e6114f76e3e7d8d4e899d..fbbdba434bbc5a7e9edfb38a11c513d9a991ea18 100644 --- a/LayoutTests/platform/qt/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.txt +++ b/LayoutTests/platform/qt/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.txt @@ -30,7 +30,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (2,2) size 63x17 text run at (2,2) width 63: "col 3 row 3" RenderBlock (anonymous) at (0,50) size 784x32 - RenderButton {BUTTON} at (2,2) size 393x28 [color=#1A1A1A] [bgcolor=#C0C0C0] + RenderButton {BUTTON} at (2,2) size 393x28 [bgcolor=#C0C0C0] RenderBlock (anonymous) at (6,6) size 381x17 RenderText {#text} at (0,0) size 381x17 text run at (0,0) width 381: "Click me to test manually. The first column should grow to 500px." diff --git a/LayoutTests/platform/qt/fast/forms/button-style-color-expected.txt b/LayoutTests/platform/qt/fast/forms/button-style-color-expected.txt new file mode 100644 index 0000000000000000000000000000000000000000..519f4346c76c7620963208a2b27a6df7c1faf036 --- /dev/null +++ b/LayoutTests/platform/qt/fast/forms/button-style-color-expected.txt @@ -0,0 +1,52 @@ +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 + RenderButton {BUTTON} at (2,2) size 80x28 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (6,6) size 68x17 + RenderText {#text} at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (84,8) size 4x17 + text run at (84,8) width 4: " " + RenderButton {BUTTON} at (90,2) size 80x28 [color=#FF0000] [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (6,6) size 68x17 + RenderText {#text} at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (172,8) size 4x17 + text run at (172,8) width 4: " " + RenderButton {BUTTON} at (178,4) size 84x26 [bgcolor=#008000] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,4) size 68x17 + RenderText {#text} at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (264,8) size 4x17 + text run at (264,8) width 4: " " + RenderButton {BUTTON} at (270,4) size 84x26 [color=#FF0000] [bgcolor=#008000] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,4) size 68x17 + RenderText {#text} at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (356,8) size 4x17 + text run at (356,8) width 4: " " + RenderButton {INPUT} at (362,2) size 80x28 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (6,6) size 68x17 + RenderText at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (444,8) size 4x17 + text run at (444,8) width 4: " " + RenderButton {INPUT} at (450,2) size 80x28 [color=#FF0000] [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (6,6) size 68x17 + RenderText at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (532,8) size 4x17 + text run at (532,8) width 4: " " + RenderButton {INPUT} at (538,4) size 84x26 [bgcolor=#008000] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,4) size 68x17 + RenderText at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (624,8) size 4x17 + text run at (624,8) width 4: " " + RenderButton {INPUT} at (630,4) size 84x26 [color=#FF0000] [bgcolor=#008000] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,4) size 68x17 + RenderText at (0,0) size 68x17 + text run at (0,0) width 68: "Test Button" + RenderText {#text} at (0,0) size 0x0 diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 4f6090cb0da215a88ca0590b1d2c1c8c2cc3ee13..74b38baffb73a5875b7432bc470ff1dd253a27f8 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2009-07-30 Mike Fenton + + Reviewed by Adam Treat. + + Apply colour style to buttons that use Theme settings in Qt. + + https://bugs.webkit.org/show_bug.cgi?id=27814 + + * platform/qt/RenderThemeQt.cpp: + (WebCore::RenderThemeQt::adjustButtonStyle): + === End merge of nitro-extreme branch 2009-07-30 === 2009-05-11 Geoffrey Garen diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp index 5f64219c5b8f6b0294be7c65e07387eb32ffe88f..517a47ccacfe3da9187084c6260c6499fab70334 100644 --- a/WebCore/platform/qt/RenderThemeQt.cpp +++ b/WebCore/platform/qt/RenderThemeQt.cpp @@ -419,8 +419,6 @@ void RenderThemeQt::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* s setButtonSize(style); setButtonPadding(style); - - style->setColor(QApplication::palette().text().color()); } void RenderThemeQt::setButtonSize(RenderStyle* style) const