From c75b11c0a2a4e3c155f61e808946792e9be21be9 Mon Sep 17 00:00:00 2001 From: "changseok.oh@collabora.com" Date: Sat, 27 Feb 2016 15:02:59 +0000 Subject: [PATCH] Merge r190662 - [GTK] Progress bar is broken on recent GTK+ https://bugs.webkit.org/show_bug.cgi?id=149831 Reviewed by Carlos Garcia Campos. Source/WebCore: The gtk progress bar has been broken after bumping up to Gtk+-3.16. This is because the way of rendering progress bar changed after gtk+-3.13.7. See more https://mail.gnome.org/archives/commits-list/2014-August/msg03865.html gtk_render_activity is no longer valid to paint a progress bar on a newer gtk+. It should be done with gtk_render_background and gtk_render_frame. Test: fast/dom/HTMLProgressElement/native-progress-bar.html * rendering/RenderThemeGtk.cpp: (WebCore::RenderThemeGtk::paintProgressBar): LayoutTests: * fast/dom/HTMLProgressElement/native-progress-bar.html: Added. * platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.png: Added. * platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt: Added. * platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.png: Added. * platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt: Added. --- LayoutTests/ChangeLog | 13 +++++++++++++ .../native-progress-bar.html | 4 ++++ .../native-progress-bar-expected.png | Bin 0 -> 7555 bytes .../native-progress-bar-expected.txt | 16 ++++++++++++++++ .../native-progress-bar-expected.png | Bin 0 -> 16961 bytes .../native-progress-bar-expected.txt | 16 ++++++++++++++++ Source/WebCore/ChangeLog | 18 ++++++++++++++++++ .../WebCore/platform/gtk/RenderThemeGtk3.cpp | 9 +++++++-- 8 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 LayoutTests/fast/dom/HTMLProgressElement/native-progress-bar.html create mode 100644 LayoutTests/platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.png create mode 100644 LayoutTests/platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt create mode 100644 LayoutTests/platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.png create mode 100644 LayoutTests/platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index d097771062ead..b75177ea20f54 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,16 @@ +2015-10-07 ChangSeok Oh + + [GTK] Progress bar is broken on recent GTK+ + https://bugs.webkit.org/show_bug.cgi?id=149831 + + Reviewed by Carlos Garcia Campos. + + * fast/dom/HTMLProgressElement/native-progress-bar.html: Added. + * platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.png: Added. + * platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt: Added. + * platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.png: Added. + * platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt: Added. + 2014-12-07 Youenn Fablet [Soup][Curl] HTTP header values should be treated as latin1, not UTF-8 diff --git a/LayoutTests/fast/dom/HTMLProgressElement/native-progress-bar.html b/LayoutTests/fast/dom/HTMLProgressElement/native-progress-bar.html new file mode 100644 index 0000000000000..c899915ec6580 --- /dev/null +++ b/LayoutTests/fast/dom/HTMLProgressElement/native-progress-bar.html @@ -0,0 +1,4 @@ + +

Test passes if following bars are filled 30% with a color.

+
+ diff --git a/LayoutTests/platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.png b/LayoutTests/platform/gtk/fast/dom/HTMLProgressElement/native-progress-bar-expected.png new file mode 100644 index 0000000000000000000000000000000000000000..cf76d8d3c0a20f84260fa7849aa4ff33740ab8ae GIT binary patch literal 7555 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 bcZFXvivIceU&_CCP&xD)WPkO(Qy2dSN@|nx literal 0 HcmV?d00001 diff --git a/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt b/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt new file mode 100644 index 0000000000000..e29d398fa4632 --- /dev/null +++ b/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/native-progress-bar-expected.txt @@ -0,0 +1,16 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x105 + RenderBlock {HTML} at (0,0) size 800x105 + RenderBody {BODY} at (8,16) size 784x73 + RenderBlock {P} at (0,0) size 784x18 + RenderText {#text} at (0,0) size 360x18 + text run at (0,0) width 360: "Test passes if following bars are filled 30% with a color." + RenderBlock {P} at (0,34) size 784x39 + RenderProgress {PROGRESS} at (0,-1) size 160x22 + RenderBR {BR} at (160,3) size 0x18 + RenderBlock {PROGRESS} at (0,22) size 160x17 + RenderProgress {DIV} at (0,0) size 160x16 + RenderBlock {DIV} at (0,0) size 160x16 [bgcolor=#808080] + RenderBlock {DIV} at (0,0) size 48x16 [bgcolor=#008000] + RenderText {#text} at (0,0) size 0x0 diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 319df39eee6ab..f1e93fd19be3e 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,21 @@ +2015-10-07 ChangSeok Oh + + [GTK] Progress bar is broken on recent GTK+ + https://bugs.webkit.org/show_bug.cgi?id=149831 + + Reviewed by Carlos Garcia Campos. + + The gtk progress bar has been broken after bumping up to Gtk+-3.16. This is because + the way of rendering progress bar changed after gtk+-3.13.7. See more + https://mail.gnome.org/archives/commits-list/2014-August/msg03865.html + gtk_render_activity is no longer valid to paint a progress bar on a newer gtk+. + It should be done with gtk_render_background and gtk_render_frame. + + Test: fast/dom/HTMLProgressElement/native-progress-bar.html + + * rendering/RenderThemeGtk.cpp: + (WebCore::RenderThemeGtk::paintProgressBar): + 2015-04-15 Руслан Ижбулатов WebCore uses M_PI_2 instead of piOverTwoDouble diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp index 85760493fa6ce..2f2f2b6223a5f 100644 --- a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp +++ b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp @@ -759,9 +759,14 @@ bool RenderThemeGtk::paintProgressBar(RenderObject* renderObject, const PaintInf rect.height() - (padding.top + padding.bottom)); progressRect = RenderThemeGtk::calculateProgressRect(renderObject, progressRect); - if (!progressRect.isEmpty()) + if (!progressRect.isEmpty()) { +#if GTK_CHECK_VERSION(3, 13, 7) + gtk_render_background(context, paintInfo.context->platformContext()->cr(), progressRect.x(), progressRect.y(), progressRect.width(), progressRect.height()); + gtk_render_frame(context, paintInfo.context->platformContext()->cr(), progressRect.x(), progressRect.y(), progressRect.width(), progressRect.height()); +#else gtk_render_activity(context, paintInfo.context->platformContext()->cr(), progressRect.x(), progressRect.y(), progressRect.width(), progressRect.height()); - +#endif + } gtk_style_context_restore(context); return false; }