Bug 1173907 - Don't use gtk_render_activity for drawing progress chunks on GTK versions above 3.13.7. r=karlt
authorAndrew Comminos <acomminos@mozilla.com>
Wed, 15 Jul 2015 11:47:00 -0400
changeset 253351 5a14fde78ca742faa838163b6043e3e0e3217e0e
parent 253350 9435a7c512ec8f2f0036921cd6a8282bcbd0544d
child 253352 caed81b3e25ba9d0fbee5012464a4da84d20dda7
push id29065
push userryanvm@gmail.com
push dateFri, 17 Jul 2015 14:26:32 +0000
treeherdermozilla-central@911935404233 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs1173907
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1173907 - Don't use gtk_render_activity for drawing progress chunks on GTK versions above 3.13.7. r=karlt
widget/gtk/gtk3drawing.c
--- a/widget/gtk/gtk3drawing.c
+++ b/widget/gtk/gtk3drawing.c
@@ -2020,17 +2020,20 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
         rect->height = barSize;
       } else {
         rect->x += (dx < travel / 2) ? dx : travel - dx;
         rect->width = barSize;
       }
     }
   
     gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
-    gtk_render_activity(style, cr, rect->x, rect->y, rect->width, rect->height);
+    // gtk_render_activity was used to render progress chunks on GTK versions
+    // before 3.13.7, see bug 1173907.
+    if (gtk_check_version(3, 13, 7))
+      gtk_render_activity(style, cr, rect->x, rect->y, rect->width, rect->height);
     gtk_style_context_restore(style);
 
     return MOZ_GTK_SUCCESS;
 }
 
 gint
 moz_gtk_get_tab_thickness(void)
 {