PORTREVISION=	8

diff --git widget/gtk/nsLookAndFeel.cpp widget/gtk/nsLookAndFeel.cpp

index 6bb3e27c6653..f4c35d82200a 100644

--- widget/gtk/nsLookAndFeel.cpp

+++ widget/gtk/nsLookAndFeel.cpp

@@ -29,11 +29,9 @@

 #include "mozilla/gfx/2D.h"

-#if MOZ_WIDGET_GTK != 2

 #include <cairo-gobject.h>

 #include "WidgetStyleCache.h"

 #include "prenv.h"

-#endif

 using mozilla::LookAndFeel;

@@ -49,9 +47,6 @@ using mozilla::LookAndFeel;

 nsLookAndFeel::nsLookAndFeel()

     : nsXPLookAndFeel(),

-#if (MOZ_WIDGET_GTK == 2)

-      mStyle(nullptr),

-#endif

       mDefaultFontCached(false), mButtonFontCached(false),

       mFieldFontCached(false), mMenuFontCached(false),

       mInitialized(false)

@@ -66,12 +61,8 @@ nsLookAndFeel::NativeInit()

 nsLookAndFeel::~nsLookAndFeel()

 {

-#if (MOZ_WIDGET_GTK == 2)

-    g_object_unref(mStyle);

-#endif

 }

-#if MOZ_WIDGET_GTK != 2

 // Modifies color |*aDest| as if a pattern of color |aSource| was painted with

 // CAIRO_OPERATOR_OVER to a surface with color |*aDest|.

 static void

@@ -228,42 +219,19 @@ GetBorderColors(GtkStyleContext* aContext,

     *aDarkColor = GDK_RGBA_TO_NS_RGBA(darkColor);

     return ret;

 }

-#endif

 nsresult

 nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

 {

     EnsureInit();

-#if (MOZ_WIDGET_GTK == 3)

     GdkRGBA gdk_color;

-#endif

     nsresult res = NS_OK;

     switch (aID) {

         // These colors don't seem to be used for anything anymore in Mozilla

         // (except here at least TextSelectBackground and TextSelectForeground)

         // The CSS2 colors below are used.

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID_WindowBackground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WindowForeground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WidgetBackground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WidgetForeground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WidgetSelectBackground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_WidgetSelectForeground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]);

-        break;

-#else

     case eColorID_WindowBackground:

     case eColorID_WidgetBackground:

     case eColorID_TextBackground:

@@ -303,35 +271,12 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID__moz_html_cellhighlighttext:

         aColor = sTextSelectedText;

         break;

-#endif

     case eColorID_Widget3DHighlight:

         aColor = NS_RGB(0xa0,0xa0,0xa0);

         break;

     case eColorID_Widget3DShadow:

         aColor = NS_RGB(0x40,0x40,0x40);

         break;

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID_TextBackground:

-        // not used?

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_TextForeground: 

-        // not used?

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_TextSelectBackground:

-    case eColorID_IMESelectedRawTextBackground:

-    case eColorID_IMESelectedConvertedTextBackground:

-        // still used

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_TextSelectForeground:

-    case eColorID_IMESelectedRawTextForeground:

-    case eColorID_IMESelectedConvertedTextForeground:

-        // still used

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]);

-        break;

-#endif

     case eColorID_IMERawInputBackground:

     case eColorID_IMEConvertedTextBackground:

         aColor = NS_TRANSPARENT;

@@ -352,53 +297,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

       aColor = NS_RGB(0xff, 0, 0);

       break;

-#if (MOZ_WIDGET_GTK == 2)

-        // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors

-    case eColorID_activeborder:

-        // active window border

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_activecaption:

-        // active window caption background

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_appworkspace:

-        // MDI background color

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_background:

-        // desktop background

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_captiontext:

-        // text in active window caption, size box, and scrollbar arrow box (!)

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_graytext:

-        // disabled text in windows, menus, etc.

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);

-        break;

-    case eColorID_highlight:

-        // background of selected item

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_highlighttext:

-        // text of selected item

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_inactiveborder:

-        // inactive window border

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_inactivecaption:

-        // inactive window caption

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_INSENSITIVE]);

-        break;

-    case eColorID_inactivecaptiontext:

-        // text in inactive window caption

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);

-        break;

-#else

         // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors

     case eColorID_activeborder: {

         // active window border

@@ -433,7 +331,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         ReleaseStyleContext(style);

         break;

     }

-#endif

     case eColorID_infobackground:

         // tooltip background color

         aColor = sInfoBackground;

@@ -452,11 +349,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         break;

     case eColorID_scrollbar:

         // scrollbar gray area

-#if (MOZ_WIDGET_GTK == 2)

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_ACTIVE]);

-#else

         aColor = sMozScrollbar;

-#endif

         break;

     case eColorID_threedlightshadow:

@@ -465,11 +358,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID_threedface:

     case eColorID_buttonface:

         // 3-D face color

-#if (MOZ_WIDGET_GTK == 3)

         aColor = sMozWindowBackground;

-#else

-        aColor = sButtonBackground;

-#endif

         break;

     case eColorID_buttontext:

@@ -491,56 +380,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         aColor = sFrameInnerDarkBorder;

         break;

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID_threeddarkshadow:

-        // 3-D shadow outer edge color

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->black);

-        break;

-

-    case eColorID_window:

-    case eColorID_windowframe:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-

-    case eColorID_windowtext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-

-    case eColorID__moz_eventreerow:

-    case eColorID__moz_field:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_fieldtext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_dialog:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_dialogtext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_dragtargetzone:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);

-        break; 

-    case eColorID__moz_buttondefault:

-        // default button border color

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->black);

-        break;

-    case eColorID__moz_buttonhoverface:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_PRELIGHT]);

-        break;

-    case eColorID__moz_buttonhovertext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_PRELIGHT]);

-        break;

-    case eColorID__moz_cellhighlight:

-    case eColorID__moz_html_cellhighlight:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_ACTIVE]);

-        break;

-    case eColorID__moz_cellhighlighttext:

-    case eColorID__moz_html_cellhighlighttext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_ACTIVE]);

-        break;

-#else

     case eColorID_threeddarkshadow:

         // Hardcode to black

         aColor = NS_RGB(0x00,0x00,0x00);

@@ -574,7 +413,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID__moz_buttonhovertext:

         aColor = sButtonHoverText;

         break;

-#endif

     case eColorID__moz_menuhover:

         aColor = sMenuHover;

         break;

@@ -590,11 +428,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID__moz_comboboxtext:

         aColor = sComboBoxText;

         break;

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID__moz_combobox:

-        aColor = sComboBoxBackground;

-        break;

-#endif

     case eColorID__moz_menubartext:

         aColor = sMenuBarText;

         break;

@@ -602,11 +435,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         aColor = sMenuBarHoverText;

         break;

     case eColorID__moz_gtk_info_bar_text:

-#if (MOZ_WIDGET_GTK == 3)

         aColor = sInfoBarText;

-#else

-        aColor = sInfoText;

-#endif

         break;

     default:

         /* default color is BLACK */

@@ -618,27 +447,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     return res;

 }

-#if (MOZ_WIDGET_GTK == 2)

-static void darken_gdk_color(GdkColor *src, GdkColor *dest)

-{

-    gdouble red;

-    gdouble green;

-    gdouble blue;

-

-    red = (gdouble) src->red / 65535.0;

-    green = (gdouble) src->green / 65535.0;

-    blue = (gdouble) src->blue / 65535.0;

-

-    red *= 0.93;

-    green *= 0.93;

-    blue *= 0.93;

-

-    dest->red = red * 65535.0;

-    dest->green = green * 65535.0;

-    dest->blue = blue * 65535.0;

-}

-#endif

-

 static int32_t CheckWidgetStyle(GtkWidget* aWidget, const char* aStyle, int32_t aResult) {

     gboolean value = FALSE;

     gtk_widget_style_get(aWidget, aStyle, &value, nullptr);

@@ -826,14 +634,8 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)

         res = NS_ERROR_NOT_IMPLEMENTED;

         break;

     case eIntID_TouchEnabled:

-#if MOZ_WIDGET_GTK == 3

         aResult = mozilla::widget::WidgetUtils::IsTouchDeviceSupportPresent();

         break;

-#else

-        aResult = 0;

-        res = NS_ERROR_NOT_IMPLEMENTED;

-#endif

-        break;

     case eIntID_MacGraphiteTheme:

         aResult = 0;

         res = NS_ERROR_NOT_IMPLEMENTED;

@@ -905,24 +707,20 @@ nsLookAndFeel::GetFloatImpl(FloatID aID, float &aResult)

 }

 static void

-GetSystemFontInfo(GtkWidget *aWidget,

+GetSystemFontInfo(GtkStyleContext *aStyle,

                   nsString *aFontName,

                   gfxFontStyle *aFontStyle)

 {

-    GtkSettings *settings = gtk_widget_get_settings(aWidget);

-

     aFontStyle->style       = NS_FONT_STYLE_NORMAL;

-    gchar *fontname;

-    g_object_get(settings, "gtk-font-name", &fontname, nullptr);

-

+    // As in

+    // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333

     PangoFontDescription *desc;

-    desc = pango_font_description_from_string(fontname);

+    gtk_style_context_get(aStyle, gtk_style_context_get_state(aStyle),

+                          "font", &desc, nullptr);

     aFontStyle->systemFont = true;

-    g_free(fontname);

-

     NS_NAMED_LITERAL_STRING(quote, "\"");

     NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc));

     *aFontName = quote + family + quote;

@@ -953,96 +751,28 @@ GetSystemFontInfo(GtkWidget *aWidget,

     pango_font_description_free(desc);

 }

-static void

-GetSystemFontInfo(LookAndFeel::FontID aID,

-                  nsString *aFontName,

-                  gfxFontStyle *aFontStyle)

-{

-    if (aID == LookAndFeel::eFont_Widget) {

-        GtkWidget *label = gtk_label_new("M");

-        GtkWidget *parent = gtk_fixed_new();

-        GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

-

-        gtk_container_add(GTK_CONTAINER(parent), label);

-        gtk_container_add(GTK_CONTAINER(window), parent);

-

-        gtk_widget_ensure_style(label);

-        GetSystemFontInfo(label, aFontName, aFontStyle);

-        gtk_widget_destroy(window);  // no unref, windows are different

-

-    } else if (aID == LookAndFeel::eFont_Button) {

-        GtkWidget *label = gtk_label_new("M");

-        GtkWidget *parent = gtk_fixed_new();

-        GtkWidget *button = gtk_button_new();

-        GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

-

-        gtk_container_add(GTK_CONTAINER(button), label);

-        gtk_container_add(GTK_CONTAINER(parent), button);

-        gtk_container_add(GTK_CONTAINER(window), parent);

-

-        gtk_widget_ensure_style(label);

-        GetSystemFontInfo(label, aFontName, aFontStyle);

-        gtk_widget_destroy(window);  // no unref, windows are different

-

-    } else if (aID == LookAndFeel::eFont_Field) {

-        GtkWidget *entry = gtk_entry_new();

-        GtkWidget *parent = gtk_fixed_new();

-        GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

-

-        gtk_container_add(GTK_CONTAINER(parent), entry);

-        gtk_container_add(GTK_CONTAINER(window), parent);

-

-        gtk_widget_ensure_style(entry);

-        GetSystemFontInfo(entry, aFontName, aFontStyle);

-        gtk_widget_destroy(window);  // no unref, windows are different

-

-    } else {

-        MOZ_ASSERT(aID == LookAndFeel::eFont_Menu, "unexpected font ID");

-        GtkWidget *accel_label = gtk_accel_label_new("M");

-        GtkWidget *menuitem = gtk_menu_item_new();

-        GtkWidget *menu = gtk_menu_new();

-        g_object_ref_sink(menu);

-

-        gtk_container_add(GTK_CONTAINER(menuitem), accel_label);

-        gtk_menu_shell_append((GtkMenuShell *)GTK_MENU(menu), menuitem);

-

-        gtk_widget_ensure_style(accel_label);

-        GetSystemFontInfo(accel_label, aFontName, aFontStyle);

-        g_object_unref(menu);

-    }

-}

-

 bool

 nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,

                            gfxFontStyle& aFontStyle,

                            float aDevPixPerCSSPixel)

 {

-  nsString *cachedFontName = nullptr;

-  gfxFontStyle *cachedFontStyle = nullptr;

-  bool *isCached = nullptr;

-

   switch (aID) {

     case eFont_Menu:         // css2

     case eFont_PullDownMenu: // css3

-      cachedFontName = &mMenuFontName;

-      cachedFontStyle = &mMenuFontStyle;

-      isCached = &mMenuFontCached;

-      aID = eFont_Menu;

-      break;

+      aFontName = mMenuFontName;

+      aFontStyle = mMenuFontStyle;

+      return true;

     case eFont_Field:        // css3

     case eFont_List:         // css3

-      cachedFontName = &mFieldFontName;

-      cachedFontStyle = &mFieldFontStyle;

-      isCached = &mFieldFontCached;

-      aID = eFont_Field;

-      break;

+      aFontName = mFieldFontName;

+      aFontStyle = mFieldFontStyle;

+      return true;

     case eFont_Button:       // css3

-      cachedFontName = &mButtonFontName;

-      cachedFontStyle = &mButtonFontStyle;

-      isCached = &mButtonFontCached;

-      break;

+      aFontName = mButtonFontName;

+      aFontStyle = mButtonFontStyle;

+      return true;

     case eFont_Caption:      // css2

     case eFont_Icon:         // css2

@@ -1057,21 +787,11 @@ nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,

     case eFont_Dialog:       // css3

     case eFont_Tooltips:     // moz

     case eFont_Widget:       // moz

-      cachedFontName = &mDefaultFontName;

-      cachedFontStyle = &mDefaultFontStyle;

-      isCached = &mDefaultFontCached;

-      aID = eFont_Widget;

-      break;

-  }

-

-  if (!*isCached) {

-    GetSystemFontInfo(aID, cachedFontName, cachedFontStyle);

-    *isCached = true;

+    default:

+      aFontName = mDefaultFontName;

+      aFontStyle = mDefaultFontStyle;

+      return true;

   }

-

-  aFontName = *cachedFontName;

-  aFontStyle = *cachedFontStyle;

-  return true;

 }

 void

@@ -1087,70 +807,6 @@ nsLookAndFeel::EnsureInit()

     // gtk does non threadsafe refcounting

     MOZ_ASSERT(NS_IsMainThread());

-#if (MOZ_WIDGET_GTK == 2)

-    NS_ASSERTION(!mStyle, "already initialized");

-    // GtkInvisibles come with a refcount that is not floating

-    // (since their initialization code calls g_object_ref_sink) and

-    // their destroy code releases that reference (which means they

-    // have to be explicitly destroyed, since calling unref enough

-    // to cause destruction would lead to *another* unref).

-    // However, this combination means that it's actually still ok

-    // to use the normal pattern, which is to g_object_ref_sink

-    // after construction, and then destroy *and* unref when we're

-    // done.  (Though we could skip the g_object_ref_sink and the

-    // corresponding g_object_unref, but that's particular to

-    // GtkInvisibles and GtkWindows.)

-    GtkWidget *widget = gtk_invisible_new();

-    g_object_ref_sink(widget); // effectively g_object_ref (see above)

-

-    gtk_widget_ensure_style(widget);

-    mStyle = gtk_style_copy(gtk_widget_get_style(widget));

-

-    gtk_widget_destroy(widget);

-    g_object_unref(widget);

-        

-    // tooltip foreground and background

-    GtkStyle *style = gtk_rc_get_style_by_paths(gtk_settings_get_default(),

-                                                "gtk-tooltips", "GtkWindow",

-                                                GTK_TYPE_WINDOW);

-    if (style) {

-        sInfoBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-        sInfoText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-

-    // menu foreground & menu background

-    GtkWidget *accel_label = gtk_accel_label_new("M");

-    GtkWidget *menuitem = gtk_menu_item_new();

-    GtkWidget *menu = gtk_menu_new();

-

-    g_object_ref_sink(menu);

-

-    gtk_container_add(GTK_CONTAINER(menuitem), accel_label);

-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);

-

-    gtk_widget_set_style(accel_label, nullptr);

-    gtk_widget_set_style(menu, nullptr);

-    gtk_widget_realize(menu);

-    gtk_widget_realize(accel_label);

-

-    style = gtk_widget_get_style(accel_label);

-    if (style) {

-        sMenuText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-

-    style = gtk_widget_get_style(menu);

-    if (style) {

-        sMenuBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-    }

-    

-    style = gtk_widget_get_style(menuitem);

-    if (style) {

-        sMenuHover = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_PRELIGHT]);

-        sMenuHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_PRELIGHT]);

-    }

-

-    g_object_unref(menu);

-#else

     GdkRGBA color;

     GtkStyleContext *style;

@@ -1195,6 +851,12 @@ nsLookAndFeel::EnsureInit()

         }

     }

+    // The label is not added to a parent widget, but shared for constructing

+    // different style contexts.  The node hierarchy is constructed only on

+    // the label style context.

+    GtkWidget *labelWidget = gtk_label_new("M");

+    g_object_ref_sink(labelWidget);

+

     // Scrollbar colors

     style = ClaimStyleContext(MOZ_GTK_SCROLLBAR_TROUGH_VERTICAL);

     gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);

@@ -1208,6 +870,13 @@ nsLookAndFeel::EnsureInit()

     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);

     sMozWindowText = GDK_RGBA_TO_NS_RGBA(color);

     ReleaseStyleContext(style);

+    style = ClaimStyleContext(MOZ_GTK_WINDOW_CONTAINER);

+    {

+        GtkStyleContext* labelStyle = CreateStyleForWidget(labelWidget, style);

+        GetSystemFontInfo(labelStyle, &mDefaultFontName, &mDefaultFontStyle);

+        g_object_unref(labelStyle);

+    }

+    ReleaseStyleContext(style);

     // tooltip foreground and background

     style = ClaimStyleContext(MOZ_GTK_TOOLTIP);

@@ -1224,6 +893,9 @@ nsLookAndFeel::EnsureInit()

     {

         GtkStyleContext* accelStyle =

             CreateStyleForWidget(gtk_accel_label_new("M"), style);

+

+        GetSystemFontInfo(accelStyle, &mMenuFontName, &mMenuFontStyle);

+

         gtk_style_context_get_color(accelStyle, GTK_STATE_FLAG_NORMAL, &color);

         sMenuText = GDK_RGBA_TO_NS_RGBA(color);

         gtk_style_context_get_color(accelStyle, GTK_STATE_FLAG_INSENSITIVE, &color);

@@ -1243,17 +915,8 @@ nsLookAndFeel::EnsureInit()

     gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);

     sMenuHoverText = GDK_RGBA_TO_NS_RGBA(color);

     ReleaseStyleContext(style);

-#endif

-    // button styles

     GtkWidget *parent = gtk_fixed_new();

-    GtkWidget *button = gtk_button_new();

-    GtkWidget *label = gtk_label_new("M");

-#if (MOZ_WIDGET_GTK == 2)

-    GtkWidget *combobox = gtk_combo_box_new();

-    GtkWidget *comboboxLabel = gtk_label_new("M");

-    gtk_container_add(GTK_CONTAINER(combobox), comboboxLabel);

-#endif

     GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

     GtkWidget *treeView = gtk_tree_view_new();

     GtkWidget *linkButton = gtk_link_button_new("http://example.com/");

@@ -1262,94 +925,14 @@ nsLookAndFeel::EnsureInit()

     GtkWidget *entry = gtk_entry_new();

     GtkWidget *textView = gtk_text_view_new();

-    gtk_container_add(GTK_CONTAINER(button), label);

-    gtk_container_add(GTK_CONTAINER(parent), button);

     gtk_container_add(GTK_CONTAINER(parent), treeView);

     gtk_container_add(GTK_CONTAINER(parent), linkButton);

-#if (MOZ_WIDGET_GTK == 2)

-    gtk_container_add(GTK_CONTAINER(parent), combobox);

-#endif

     gtk_container_add(GTK_CONTAINER(parent), menuBar);

     gtk_menu_shell_append(GTK_MENU_SHELL(menuBar), menuBarItem);

     gtk_container_add(GTK_CONTAINER(window), parent);

     gtk_container_add(GTK_CONTAINER(parent), entry);

     gtk_container_add(GTK_CONTAINER(parent), textView);

-#if (MOZ_WIDGET_GTK == 2)

-    gtk_widget_set_style(button, nullptr);

-    gtk_widget_set_style(label, nullptr);

-    gtk_widget_set_style(treeView, nullptr);

-    gtk_widget_set_style(linkButton, nullptr);

-    gtk_widget_set_style(combobox, nullptr);

-    gtk_widget_set_style(comboboxLabel, nullptr);

-    gtk_widget_set_style(menuBar, nullptr);

-    gtk_widget_set_style(entry, nullptr);

-

-    gtk_widget_realize(button);

-    gtk_widget_realize(label);

-    gtk_widget_realize(treeView);

-    gtk_widget_realize(linkButton);

-    gtk_widget_realize(combobox);

-    gtk_widget_realize(comboboxLabel);

-    gtk_widget_realize(menuBar);

-    gtk_widget_realize(entry);

-

-    style = gtk_widget_get_style(label);

-    if (style) {

-        sButtonText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-

-    style = gtk_widget_get_style(comboboxLabel);

-    if (style) {

-        sComboBoxText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-    style = gtk_widget_get_style(combobox);

-    if (style) {

-        sComboBoxBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-    }

-

-    style = gtk_widget_get_style(menuBar);

-    if (style) {

-        sMenuBarText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-        sMenuBarHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_SELECTED]);

-    }

-

-    // GTK's guide to fancy odd row background colors:

-    // 1) Check if a theme explicitly defines an odd row color

-    // 2) If not, check if it defines an even row color, and darken it

-    //    slightly by a hardcoded value (gtkstyle.c)

-    // 3) If neither are defined, take the base background color and

-    //    darken that by a hardcoded value

-    colorValuePtr = nullptr;

-    gtk_widget_style_get(treeView,

-                         "odd-row-color", &colorValuePtr,

-                         nullptr);

-

-    if (colorValuePtr) {

-        colorValue = *colorValuePtr;

-    } else {

-        gtk_widget_style_get(treeView,

-                             "even-row-color", &colorValuePtr,

-                             nullptr);

-        if (colorValuePtr)

-            darken_gdk_color(colorValuePtr, &colorValue);

-        else

-            darken_gdk_color(&treeView->style->base[GTK_STATE_NORMAL], &colorValue);

-    }

-

-    sOddCellBackground = GDK_COLOR_TO_NS_RGB(colorValue);

-    if (colorValuePtr)

-        gdk_color_free(colorValuePtr);

-

-    style = gtk_widget_get_style(button);

-    if (style) {

-        sButtonBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-        sFrameOuterLightBorder =

-            GDK_COLOR_TO_NS_RGB(style->light[GTK_STATE_NORMAL]);

-        sFrameInnerDarkBorder =

-            GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);

-    }

-#else

     // Text colors

     GdkRGBA bgColor;

     // If the text window background is translucent, then the background of

@@ -1381,8 +964,10 @@ nsLookAndFeel::EnsureInit()

     // Button text color

     style = ClaimStyleContext(MOZ_GTK_BUTTON);

     {

-        GtkStyleContext* labelStyle =

-            CreateStyleForWidget(gtk_label_new("M"), style);

+        GtkStyleContext* labelStyle = CreateStyleForWidget(labelWidget, style);

+

+        GetSystemFontInfo(labelStyle, &mButtonFontName, &mButtonFontStyle);

+

         gtk_style_context_get_color(labelStyle, GTK_STATE_FLAG_NORMAL, &color);

         sButtonText = GDK_RGBA_TO_NS_RGBA(color);

         gtk_style_context_get_color(labelStyle, GTK_STATE_FLAG_PRELIGHT, &color);

@@ -1446,7 +1031,6 @@ nsLookAndFeel::EnsureInit()

     gtk_style_context_add_class(style, GTK_STYLE_CLASS_INFO);

     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);

     sInfoBarText = GDK_RGBA_TO_NS_RGBA(color);

-#endif

     // Some themes have a unified menu bar, and support window dragging on it

     gboolean supports_menubar_drag = FALSE;

     GParamSpec *param_spec =

@@ -1493,7 +1074,11 @@ nsLookAndFeel::EnsureInit()

                          "cursor-aspect-ratio", &sCaretRatio,

                          nullptr);

+    GetSystemFontInfo(gtk_widget_get_style_context(entry),

+                      &mFieldFontName, &mFieldFontStyle);

+

     gtk_widget_destroy(window);

+    g_object_unref(labelWidget);

 }

 // virtual

@@ -1515,11 +1100,6 @@ nsLookAndFeel::RefreshImpl()

     mFieldFontCached = false;

     mMenuFontCached = false;

-#if (MOZ_WIDGET_GTK == 2)

-    g_object_unref(mStyle);

-    mStyle = nullptr;

-#endif

-

     mInitialized = false;

 }

diff --git widget/gtk/nsLookAndFeel.h widget/gtk/nsLookAndFeel.h

index 9a4015e95415..38cd51c056d6 100644

--- widget/gtk/nsLookAndFeel.h

+++ widget/gtk/nsLookAndFeel.h

@@ -33,9 +33,6 @@ public:

     virtual bool GetEchoPasswordImpl();

 protected:

-#if (MOZ_WIDGET_GTK == 2)

-    struct _GtkStyle *mStyle;

-#endif

     // Cached fonts

     bool mDefaultFontCached;

@@ -63,7 +60,6 @@ protected:

     nscolor sMenuHoverText;

     nscolor sButtonText;

     nscolor sButtonHoverText;

-    nscolor sButtonBackground;

     nscolor sFrameOuterLightBorder;

     nscolor sFrameInnerDarkBorder;

     nscolor sOddCellBackground;

@@ -77,9 +73,7 @@ protected:

     nscolor sTextSelectedText;

     nscolor sTextSelectedBackground;

     nscolor sMozScrollbar;

-#if (MOZ_WIDGET_GTK == 3)

     nscolor sInfoBarText;

-#endif

     char16_t sInvisibleCharacter;

     float   sCaretRatio;

     bool    sMenuSupportsDrag;

commit efbe3a9af876

Author: Manish Goregaokar <manishearth@gmail.com>

Date:   Wed Aug 2 11:24:35 2017 -0700

    Bug 1386887 - Clean up FFI lifetimes to work on nightly; r=emilio

    MozReview-Commit-ID: 5WAIVd6p2du

---

 layout/style/ServoBindingList.h  | 4 ++--

 layout/style/ServoBindingTypes.h | 2 ++

 layout/style/ServoBindings.h     | 4 ++--

 layout/style/ServoBindings.toml  | 4 +++-

 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git layout/style/ServoBindingList.h layout/style/ServoBindingList.h

index 6c669ebb3d3e..87ade14ea4de 100644

--- layout/style/ServoBindingList.h

+++ layout/style/ServoBindingList.h

@@ -379,10 +379,10 @@ SERVO_BINDING_FUNC(Servo_DeclarationBlock_HasCSSWideKeyword, bool,

                    nsCSSPropertyID property)

 // Compose animation value for a given property.

 // |base_values| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>.

-// We use void* to avoid exposing nsRefPtrHashtable in FFI.

+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI.

 SERVO_BINDING_FUNC(Servo_AnimationCompose, void,

                    RawServoAnimationValueMapBorrowedMut animation_values,

-                   void* base_values,

+                   RawServoAnimationValueTableBorrowed base_values,

                    nsCSSPropertyID property,

                    RawGeckoAnimationPropertySegmentBorrowed animation_segment,

                    RawGeckoAnimationPropertySegmentBorrowed last_segment,

diff --git layout/style/ServoBindingTypes.h layout/style/ServoBindingTypes.h

index aaf4fc27e1b9..69be15ee9f51 100644

--- layout/style/ServoBindingTypes.h

+++ layout/style/ServoBindingTypes.h

@@ -54,6 +54,8 @@ class nsXBLBinding;

 using mozilla::dom::StyleChildrenIterator;

 using mozilla::ServoElementSnapshot;

+typedef void* RawServoAnimationValueTableBorrowed;

+

 typedef nsINode RawGeckoNode;

 typedef mozilla::dom::Element RawGeckoElement;

 typedef nsIDocument RawGeckoDocument;

diff --git layout/style/ServoBindings.h layout/style/ServoBindings.h

index 493ca63f932b..c6ced6d1fedb 100644

--- layout/style/ServoBindings.h

+++ layout/style/ServoBindings.h

@@ -268,9 +268,9 @@ double Gecko_GetPositionInSegment(

 // Get servo's AnimationValue for |aProperty| from the cached base style

 // |aBaseStyles|.

 // |aBaseStyles| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>.

-// We use void* to avoid exposing nsRefPtrHashtable in FFI.

+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI.

 RawServoAnimationValueBorrowedOrNull Gecko_AnimationGetBaseStyle(

-  void* aBaseStyles,

+  RawServoAnimationValueTableBorrowed aBaseStyles,

   nsCSSPropertyID aProperty);

 void Gecko_StyleTransition_SetUnsupportedProperty(

   mozilla::StyleTransition* aTransition,

diff --git layout/style/ServoBindings.toml layout/style/ServoBindings.toml

index 11e372541235..3c3902beea80 100644

--- layout/style/ServoBindings.toml

+++ layout/style/ServoBindings.toml

@@ -357,6 +357,7 @@ raw-lines = [

     "pub type ServoStyleContextBorrowed<'a> = &'a ::properties::ComputedValues;",

     "pub type ServoStyleContextBorrowedOrNull<'a> = Option<&'a ::properties::ComputedValues>;",

     "pub type ServoComputedDataBorrowed<'a> = &'a ServoComputedData;",

+    "pub type RawServoAnimationValueTableBorrowed<'a> = &'a ();"

 ]

 whitelist-functions = ["Servo_.*", "Gecko_.*"]

 structs-types = [

@@ -389,7 +390,7 @@ structs-types = [

     "RawGeckoPresContext",

     "RawGeckoPresContextOwned",

     "RawGeckoStyleAnimationList",

-    "RawGeckoStyleChildrenIteratorBorrowedMut",

+    "RawGeckoStyleChildrenIterator",

     "RawGeckoServoStyleRuleList",

     "RawGeckoURLExtraData",

     "RawGeckoXBLBinding",

@@ -526,6 +527,7 @@ servo-borrow-types = [

     "RawGeckoFontFaceRuleList",

     "RawGeckoServoStyleRuleList",

     "RawGeckoServoAnimationValueList",

+    "RawGeckoStyleChildrenIterator",

 ]

 fixups = [

     # hack for gecko-owned string

https://github.com/kinetiknz/cubeb/commit/16f9ccc064f2

--- media/libcubeb/src/cubeb_jack.cpp.orig	2017-07-07 05:37:16 UTC

+++ media/libcubeb/src/cubeb_jack.cpp

@@ -8,7 +8,9 @@

  */

 #define _DEFAULT_SOURCE

 #define _BSD_SOURCE

+#ifndef __FreeBSD__

 #define _POSIX_SOURCE

+#endif

 #include <dlfcn.h>

 #include <stdio.h>

 #include <string.h>

commit d20c7d929c84

Author: Ethan <ettseng@mozilla.com>

Date:   Fri Sep 1 17:29:44 2017 +0800

    Bug 1393283 - Use the last ESR version as the spoofed Firefox version. r=tihuang, r=mcmanus

---

 .../test/browser/browser_navigator.js              |  2 +-

 netwerk/protocol/http/nsHttpHandler.cpp            | 16 +++----

 .../resistfingerprinting/nsRFPService.cpp          | 56 ++++++++++++++++++++++

 .../components/resistfingerprinting/nsRFPService.h |  3 ++

 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git browser/components/resistfingerprinting/test/browser/browser_navigator.js browser/components/resistfingerprinting/test/browser/browser_navigator.js

index 25c393d8bb2a..9f52e34a9451 100644

--- browser/components/resistfingerprinting/test/browser/browser_navigator.js

+++ browser/components/resistfingerprinting/test/browser/browser_navigator.js

@@ -91,7 +91,7 @@ add_task(async function setup() {

   let appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);

   let appVersion = parseInt(appInfo.version);

-  let spoofedVersion = appVersion - (appVersion % 10);

+  let spoofedVersion = appVersion - ((appVersion - 3) % 7);

   spoofedUserAgent = `Mozilla/5.0 (${SPOOFED_OSCPU}; rv:${spoofedVersion}.0) Gecko/20100101 Firefox/${spoofedVersion}.0`;

 });

diff --git netwerk/protocol/http/nsHttpHandler.cpp netwerk/protocol/http/nsHttpHandler.cpp

index 31d0f8832732..b957d835b52f 100644

--- netwerk/protocol/http/nsHttpHandler.cpp

+++ netwerk/protocol/http/nsHttpHandler.cpp

@@ -461,16 +461,12 @@ nsHttpHandler::Init()

         mAppVersion.AssignLiteral(MOZ_APP_UA_VERSION);

     }

-    // Generating the spoofed userAgent for fingerprinting resistance.

-    // The browser version will be rounded down to a multiple of 10.

-    // By doing so, the anonymity group will cover more versions instead of one

-    // version.

-    uint32_t spoofedVersion = mAppVersion.ToInteger(&rv);

-    if (NS_SUCCEEDED(rv)) {

-        spoofedVersion = spoofedVersion - (spoofedVersion % 10);

-        mSpoofedUserAgent.Assign(nsPrintfCString(

-            "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",

-            SPOOFED_OSCPU, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));

+    // Generating the spoofed User Agent for fingerprinting resistance.

+    rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent);

+    if (NS_FAILED(rv)) {

+      // Empty mSpoofedUserAgent to make sure the unsuccessful spoofed UA string

+      // will not be used anywhere.

+      mSpoofedUserAgent.Truncate();

     }

     mSessionStartTime = NowInSeconds();

diff --git toolkit/components/resistfingerprinting/nsRFPService.cpp toolkit/components/resistfingerprinting/nsRFPService.cpp

index 94554200c3b8..96a2940c04a0 100644

--- toolkit/components/resistfingerprinting/nsRFPService.cpp

+++ toolkit/components/resistfingerprinting/nsRFPService.cpp

@@ -18,10 +18,13 @@

 #include "nsServiceManagerUtils.h"

 #include "nsString.h"

 #include "nsXULAppAPI.h"

+#include "nsPrintfCString.h"

 #include "nsIObserverService.h"

 #include "nsIPrefBranch.h"

 #include "nsIPrefService.h"

+#include "nsIXULAppInfo.h"

+#include "nsIXULRuntime.h"

 #include "nsJSUtils.h"

 #include "prenv.h"

@@ -162,6 +165,59 @@ nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t

   return NSToIntFloor(time * sVideoFramesPerSec * ((100 - boundedDroppedRatio) / 100.0));

 }

+/* static */

+nsresult

+nsRFPService::GetSpoofedUserAgent(nsACString &userAgent)

+{

+  // This function generates the spoofed value of User Agent.

+  // We spoof the values of the platform and Firefox version, which could be

+  // used as fingerprinting sources to identify individuals.

+  // Reference of the format of User Agent:

+  // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorID/userAgent

+  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent

+

+  nsresult rv;

+  nsCOMPtr<nsIXULAppInfo> appInfo =

+    do_GetService("@mozilla.org/xre/app-info;1", &rv);

+  NS_ENSURE_SUCCESS(rv, rv);

+

+  nsAutoCString appVersion;

+  rv = appInfo->GetVersion(appVersion);

+  NS_ENSURE_SUCCESS(rv, rv);

+

+  // The browser version will be spoofed as the last ESR version.

+  // By doing so, the anonymity group will cover more versions instead of one

+  // version.

+  uint32_t firefoxVersion = appVersion.ToInteger(&rv);

+  NS_ENSURE_SUCCESS(rv, rv);

+

+  // Starting from Firefox 10, Firefox ESR was released once every seven

+  // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.

+  // We infer the last and closest ESR version based on this rule.

+  nsCOMPtr<nsIXULRuntime> runtime =

+    do_GetService("@mozilla.org/xre/runtime;1", &rv);

+  NS_ENSURE_SUCCESS(rv, rv);

+

+  nsAutoCString updateChannel;

+  rv = runtime->GetDefaultUpdateChannel(updateChannel);

+  NS_ENSURE_SUCCESS(rv, rv);

+

+  // If we are running in Firefox ESR, determine whether the formula of ESR

+  // version has changed.  Once changed, we must update the formula in this

+  // function.

+  if (updateChannel.Equals("esr")) {

+    MOZ_ASSERT(((firefoxVersion % 7) == 3),

+      "Please udpate ESR version formula in nsRFPService.cpp");

+  }

+

+  uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 3) % 7);

+  userAgent.Assign(nsPrintfCString(

+    "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",

+    SPOOFED_OSCPU, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));

+

+  return rv;

+}

+

 nsresult

 nsRFPService::Init()

 {

diff --git toolkit/components/resistfingerprinting/nsRFPService.h toolkit/components/resistfingerprinting/nsRFPService.h

index cf1f688bb992..bad80383883b 100644

--- toolkit/components/resistfingerprinting/nsRFPService.h

+++ toolkit/components/resistfingerprinting/nsRFPService.h

@@ -49,6 +49,9 @@ public:

   static uint32_t GetSpoofedDroppedFrames(double aTime, uint32_t aWidth, uint32_t aHeight);

   static uint32_t GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t aHeight);

+  // This method generates the spoofed value of User Agent.

+  static nsresult GetSpoofedUserAgent(nsACString &userAgent);

+

 private:

   nsresult Init();

commit d0ed05261f20

Author: jason laster <jlaster@mozilla.com>

Date:   Wed Sep 20 10:52:54 2017 -0400

    Bug 1401573 - Fix PoE, Link, and linux issue. r=nchevobbe

    MozReview-Commit-ID: 35TA6bhW1Wr

---

 devtools/client/debugger/new/debugger.js           | 68 +++++++++++++++++-----

 devtools/client/debugger/new/panel.js              | 27 ++++++++-

 .../new/test/mochitest/browser_dbg-expressions.js  |  2 +-

 3 files changed, 79 insertions(+), 18 deletions(-)

diff --git devtools/client/debugger/new/debugger.js devtools/client/debugger/new/debugger.js

index f52a3e380ab6..c1213180cb13 100644

--- devtools/client/debugger/new/debugger.js

+++ devtools/client/debugger/new/debugger.js

@@ -29493,7 +29493,8 @@ return /******/ (function(modules) { // webpackBootstr

 	}

 	function getKeyForOS(os, action) {

-	  return KEYS[os][action];

+         var osActions = KEYS[os] || KEYS.Linux;

+         return osActions[action];

 	}

 	function formatKey(action) {

Bug 1409680 - Extend --disable-debug-symbols to Rust code.

This reduces disk I/O and memory usage during build that already lacks

debugging symbols from C++ code, allowing to use more jobs on 32bit hosts.

--disable-debug-symbols build on FreeBSD 10.3 i386 (8 cores) host:

Max RSS before:  libxul - 612 Mb, libgkrust - 1908 Mb

Max RSS after:   libxul - 444 Mb, libgkrust - 1471 Mb

Binary before:   libxul - 203 Mb, libgkrust -  732 Mb

Binary after:    libxul - 123 Mb, libgkrust -  301 Mb

--- config/rules.mk.orig	2017-09-14 20:15:53 UTC

+++ config/rules.mk

@@ -906,11 +906,13 @@ ifdef MOZ_USING_SCCACHE

 sccache_wrap := RUSTC_WRAPPER='$(CCACHE)'

 endif

+ifdef MOZ_DEBUG_SYMBOLS

 # XXX hack to work around dsymutil failing on cross-OSX builds (bug 1380381)

 ifeq ($(HOST_OS_ARCH)-$(OS_ARCH),Linux-Darwin)

 default_rustflags += -C debuginfo=1

 else

 default_rustflags += -C debuginfo=2

+endif

 endif

 # We use the + prefix to pass down the jobserver fds to cargo, but we

commit 4cbdfa028752

Author: Manish Goregaokar <manishsmail@gmail.com>

Date:   Tue Aug 1 12:57:42 2017 -0500

    servo: Merge #17934 - Remove doc comment on statement (from Manishearth:doc-comment); r=canaltinova

    rustc warns about these now

    Source-Repo: https://github.com/servo/servo

    Source-Revision: b49311c65a083a9b8eb03741bf7ea980b64f1e03

    --HG--

    extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear

    extra : subtree_revision : 6b3c7d7f4ffeb9e271c52d418cda42cac5dd378d

---

 servo/components/style/values/specified/image.rs | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git servo/components/style/values/specified/image.rs servo/components/style/values/specified/image.rs

index 37ed00ccf443..687c6f17d432 100644

--- servo/components/style/values/specified/image.rs

+++ servo/components/style/values/specified/image.rs

@@ -686,14 +686,14 @@ impl LineDirection {

         input.try(|i| {

             let to_ident = i.try(|i| i.expect_ident_matching("to"));

             match *compat_mode {

-                /// `to` keyword is mandatory in modern syntax.

+                // `to` keyword is mandatory in modern syntax.

                 CompatMode::Modern => to_ident?,

                 // Fall back to Modern compatibility mode in case there is a `to` keyword.

                 // According to Gecko, `-moz-linear-gradient(to ...)` should serialize like

                 // `linear-gradient(to ...)`.

                 CompatMode::Moz if to_ident.is_ok() => *compat_mode = CompatMode::Modern,

-                /// There is no `to` keyword in webkit prefixed syntax. If it's consumed,

-                /// parsing should throw an error.

+                // There is no `to` keyword in webkit prefixed syntax. If it's consumed,

+                // parsing should throw an error.

                 CompatMode::WebKit if to_ident.is_ok() => {

                     return Err(SelectorParseError::UnexpectedIdent("to".into()).into())

                 },

diff --git servo/components/style/properties/gecko.mako.rs servo/components/style/properties/gecko.mako.rs

index 37ed00ccf443..687c6f17d432 100644

--- servo/components/style/properties/gecko.mako.rs

+++ servo/components/style/properties/gecko.mako.rs

@@ -2081,7 +2081,7 @@ fn static_assert() {

             return (parent_size, parent_unconstrained_size)

         }

-        /// XXXManishearth this should also handle text zoom

+        // XXXManishearth this should also handle text zoom

         let min = Au(parent.gecko.mScriptMinSize);

         let scale = (parent.gecko.mScriptSizeMultiplier as f32).powi(delta as i32);

commit 9f5c1f2e4b5b

Author: Manish Goregaokar <manishsmail@gmail.com>

Date:   Thu Aug 3 16:27:12 2017 -0500

    servo: Merge #17969 - Update stylo code to work on nightly (from Manishearth:rustup); r=emilio

    r=emilio https://bugzilla.mozilla.org/show_bug.cgi?id=1386887

    Source-Repo: https://github.com/servo/servo

    Source-Revision: 7cee7d7fcc4194e410fa8a308a77d37ac452778a

    --HG--

    extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear

    extra : subtree_revision : d9c874ebcfa1e64c86265d0ed2e5cff65d9133be

---

 servo/components/style/gecko/generated/bindings.rs | 12 +++++++++---

 servo/components/style/gecko/wrapper.rs            |  7 ++++++-

 servo/ports/geckolib/glue.rs                       |  3 ++-

 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git servo/components/style/gecko/generated/bindings.rs servo/components/style/gecko/generated/bindings.rs

index e46bdfe1e1ea..b6703ab95bf7 100644

--- servo/components/style/gecko/generated/bindings.rs

+++ servo/components/style/gecko/generated/bindings.rs

@@ -8,6 +8,7 @@ type nsAString_internal = nsAString;

 pub type ServoStyleContextBorrowed<'a> = &'a ::properties::ComputedValues;

 pub type ServoStyleContextBorrowedOrNull<'a> = Option<&'a ::properties::ComputedValues>;

 pub type ServoComputedDataBorrowed<'a> = &'a ServoComputedData;

+pub type RawServoAnimationValueTableBorrowed<'a> = &'a ();

 use gecko_bindings::structs::mozilla::css::GridTemplateAreasValue;

 use gecko_bindings::structs::mozilla::css::ErrorReporter;

 use gecko_bindings::structs::mozilla::css::ImageValue;

@@ -37,7 +38,7 @@ use gecko_bindings::structs::RawServoStyleRule;

 use gecko_bindings::structs::RawGeckoPresContext;

 use gecko_bindings::structs::RawGeckoPresContextOwned;

 use gecko_bindings::structs::RawGeckoStyleAnimationList;

-use gecko_bindings::structs::RawGeckoStyleChildrenIteratorBorrowedMut;

+use gecko_bindings::structs::RawGeckoStyleChildrenIterator;

 use gecko_bindings::structs::RawGeckoServoStyleRuleList;

 use gecko_bindings::structs::RawGeckoURLExtraData;

 use gecko_bindings::structs::RawGeckoXBLBinding;

@@ -320,6 +321,10 @@ pub type RawGeckoServoAnimationValueListBorrowed<'a> = &'a RawGeckoServoAnimatio

 pub type RawGeckoServoAnimationValueListBorrowedOrNull<'a> = Option<&'a RawGeckoServoAnimationValueList>;

 pub type RawGeckoServoAnimationValueListBorrowedMut<'a> = &'a mut RawGeckoServoAnimationValueList;

 pub type RawGeckoServoAnimationValueListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoServoAnimationValueList>;

+pub type RawGeckoStyleChildrenIteratorBorrowed<'a> = &'a RawGeckoStyleChildrenIterator;

+pub type RawGeckoStyleChildrenIteratorBorrowedOrNull<'a> = Option<&'a RawGeckoStyleChildrenIterator>;

+pub type RawGeckoStyleChildrenIteratorBorrowedMut<'a> = &'a mut RawGeckoStyleChildrenIterator;

+pub type RawGeckoStyleChildrenIteratorBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoStyleChildrenIterator>;

 pub type ServoCssRulesStrong = ::gecko_bindings::sugar::ownership::Strong<ServoCssRules>;

 pub type ServoCssRulesBorrowed<'a> = &'a ServoCssRules;

 pub type ServoCssRulesBorrowedOrNull<'a> = Option<&'a ServoCssRules>;

@@ -840,7 +845,7 @@ extern "C" {

 }

 extern "C" {

     pub fn Gecko_AnimationGetBaseStyle(aBaseStyles:

-                                           *mut ::std::os::raw::c_void,

+                                           RawServoAnimationValueTableBorrowed,

                                        aProperty: nsCSSPropertyID)

      -> RawServoAnimationValueBorrowedOrNull;

 }

@@ -2602,7 +2607,8 @@ extern "C" {

 extern "C" {

     pub fn Servo_AnimationCompose(animation_values:

                                       RawServoAnimationValueMapBorrowedMut,

-                                  base_values: *mut ::std::os::raw::c_void,

+                                  base_values:

+                                      RawServoAnimationValueTableBorrowed,

                                   property: nsCSSPropertyID,

                                   animation_segment:

                                       RawGeckoAnimationPropertySegmentBorrowed,

diff --git servo/components/style/gecko/wrapper.rs servo/components/style/gecko/wrapper.rs

index dae898692313..6d62f54951cc 100644

--- servo/components/style/gecko/wrapper.rs

+++ servo/components/style/gecko/wrapper.rs

@@ -387,7 +387,12 @@ impl<'a> Iterator for GeckoChildrenIterator<'a> {

                 curr

             },

             GeckoChildrenIterator::GeckoIterator(ref mut it) => unsafe {

-                Gecko_GetNextStyleChild(it).map(GeckoNode)

+                // We do this unsafe lengthening of the lifetime here because

+                // structs::StyleChildrenIterator is actually StyleChildrenIterator<'a>,

+                // however we can't express this easily with bindgen, and it would

+                // introduce functions with two input lifetimes into bindgen,

+                // which would be out of scope for elision.

+                Gecko_GetNextStyleChild(&mut * (it as *mut _)).map(GeckoNode)

             }

         }

     }

diff --git servo/ports/geckolib/glue.rs servo/ports/geckolib/glue.rs

index 367d24ff87b2..e69959f3710b 100644

--- servo/ports/geckolib/glue.rs

+++ servo/ports/geckolib/glue.rs

@@ -59,6 +59,7 @@ use style::gecko_bindings::bindings::RawGeckoServoStyleRuleListBorrowedMut;

 use style::gecko_bindings::bindings::RawServoAnimationValueBorrowed;

 use style::gecko_bindings::bindings::RawServoAnimationValueMapBorrowedMut;

 use style::gecko_bindings::bindings::RawServoAnimationValueStrong;

+use style::gecko_bindings::bindings::RawServoAnimationValueTableBorrowed;

 use style::gecko_bindings::bindings::RawServoStyleRuleBorrowed;

 use style::gecko_bindings::bindings::ServoStyleContextBorrowedOrNull;

 use style::gecko_bindings::bindings::nsTArrayBorrowed_uintptr_t;

@@ -374,7 +375,7 @@ pub extern "C" fn Servo_AnimationValues_ComputeDistance(from: RawServoAnimationV

 #[no_mangle]

 pub extern "C" fn Servo_AnimationCompose(raw_value_map: RawServoAnimationValueMapBorrowedMut,

-                                         base_values: *mut ::std::os::raw::c_void,

+                                         base_values: RawServoAnimationValueTableBorrowed,

                                          css_property: nsCSSPropertyID,

                                          segment: RawGeckoAnimationPropertySegmentBorrowed,

                                          last_segment: RawGeckoAnimationPropertySegmentBorrowed,

commit ea9c8db790e4

Author: Simon Sapin <simon.sapin@exyr.org>

Date:   Tue Aug 15 07:31:04 2017 -0500

    servo: Merge #18046 - Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) (from servo:rustup); r=emilio

    Source-Repo: https://github.com/servo/servo

    Source-Revision: 7d9b82b9efa7b10a2e34d93df5ac535d99518f7a

    --HG--

    extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear

    extra : subtree_revision : e1b3d113c3edaea3c4c07f8b206f2e02922e3caf

---

 servo/Cargo.lock                                   |  6 +++---

 servo/components/devtools/lib.rs                   |  2 +-

 servo/components/layout/animation.rs               |  2 +-

 servo/components/layout/construct.rs               |  6 +++---

 servo/components/layout/display_list_builder.rs    |  2 +-

 servo/components/layout/flex.rs                    |  6 +++---

 servo/components/layout/inline.rs                  |  4 ++--

 servo/components/layout/sequential.rs              |  2 +-

 servo/components/layout/table_cell.rs              |  2 +-

 servo/components/layout/text.rs                    |  2 +-

 servo/components/net/cookie_storage.rs             |  2 +-

 servo/components/profile/heartbeats.rs             |  4 ++--

 servo/components/script/dom/bindings/js.rs         |  4 ++--

 servo/components/script/dom/cssstyledeclaration.rs |  8 ++++----

 servo/components/script/dom/cssstylerule.rs        |  2 +-

 servo/components/script/dom/document.rs            | 12 ++++++------

 servo/components/script/dom/medialist.rs           |  4 ++--

 servo/components/script/dom/range.rs               |  4 ++--

 .../script/dom/servoparser/async_html.rs           |  4 ++--

 servo/components/script/dom/url.rs                 |  4 ++--

 servo/components/script/dom/vrdisplay.rs           |  2 +-

 .../components/script/dom/webglrenderingcontext.rs |  2 +-

 servo/components/script/dom/xmlhttprequest.rs      |  2 +-

 servo/components/script/lib.rs                     |  1 -

 .../script_plugins/unrooted_must_root.rs           | 22 +++++++++++++++-------

 servo/components/selectors/matching.rs             |  2 +-

 servo/components/selectors/parser.rs               |  2 +-

 .../style/invalidation/element/invalidator.rs      |  2 +-

 servo/components/style/matching.rs                 |  2 +-

 .../components/style/properties/properties.mako.rs |  2 +-

 servo/components/style/style_adjuster.rs           |  2 +-

 servo/components/style/style_resolver.rs           |  2 +-

 servo/components/style/stylesheets/rule_list.rs    |  2 +-

 servo/components/style/stylesheets/rule_parser.rs  |  2 +-

 .../components/style/stylesheets/rules_iterator.rs |  2 +-

 servo/components/style/values/animated/color.rs    |  2 +-

 servo/components/style/values/computed/border.rs   |  2 +-

 servo/components/webdriver_server/lib.rs           |  2 +-

 servo/rust-commit-hash                             |  2 +-

 servo/tests/unit/style/stylist.rs                  | 13 -------------

 40 files changed, 73 insertions(+), 79 deletions(-)

diff --git servo/Cargo.lock servo/Cargo.lock

index 50dd6e1a785a..2aa7bd8ea3dd 100644

--- servo/Cargo.lock

+++ servo/Cargo.lock

@@ -3577,7 +3577,7 @@ version = "0.1.4"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 dependencies = [

  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

- "xcb 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",

+ "xcb 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",

 ]

 [[package]]

@@ -3592,7 +3592,7 @@ dependencies = [

 [[package]]

 name = "xcb"

-version = "0.7.6"

+version = "0.7.7"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 dependencies = [

  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",

@@ -3918,7 +3918,7 @@ dependencies = [

 "checksum x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db27c597c187da52194a4b8232e7d869503911aab9ff726fefb76d7a830f78ed"

 "checksum x11-clipboard 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "731230b8edcbb9d99247105e4c9ec0a538594d50ad68d2afa8662195f9db2973"

 "checksum x11-dl 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "326c500cdc166fd7c70dd8c8a829cd5c0ce7be5a5d98c25817de2b9bdc67faf8"

-"checksum xcb 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "63e3a849b73e4e1905e4f4d48f1750429bc86ea9f473632ab382a6f69ecb6b33"

+"checksum xcb 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "7cede38417fcdf2f0a9d8abf1cea1c1b066320a8a316e9583a0d717c334fafb2"

 "checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61"

 "checksum xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1"

 "checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"

diff --git servo/components/devtools/lib.rs servo/components/devtools/lib.rs

index d5a2764a7102..6a25696eaed7 100644

--- servo/components/devtools/lib.rs

+++ servo/components/devtools/lib.rs

@@ -306,7 +306,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,

                 columnNumber: console_message.columnNumber,

             },

         };

-        for mut stream in &mut *console_actor.streams.borrow_mut() {

+        for stream in &mut *console_actor.streams.borrow_mut() {

             stream.write_json_packet(&msg);

         }

     }

diff --git servo/components/layout/animation.rs servo/components/layout/animation.rs

index e4a2782c1271..ebbba82fcc6a 100644

--- servo/components/layout/animation.rs

+++ servo/components/layout/animation.rs

@@ -39,7 +39,7 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,

             // run.

             if let Some(ref mut animations) = running_animations.get_mut(node) {

                 // TODO: This being linear is probably not optimal.

-                for mut anim in animations.iter_mut() {

+                for anim in animations.iter_mut() {

                     if let Animation::Keyframes(_, ref anim_name, ref mut anim_state) = *anim {

                         if *name == *anim_name {

                             debug!("update_animation_state: Found other animation {}", name);

diff --git servo/components/layout/construct.rs servo/components/layout/construct.rs

index c863219941e4..7ef391b42183 100644

--- servo/components/layout/construct.rs

+++ servo/components/layout/construct.rs

@@ -1921,7 +1921,7 @@ impl Legalizer {

     /// true for anonymous block children of flex flows.

     fn try_to_add_child(&mut self, context: &SharedStyleContext, parent: &mut FlowRef, child: &mut FlowRef)

                         -> bool {

-        let mut parent = self.stack.last_mut().unwrap_or(parent);

+        let parent = self.stack.last_mut().unwrap_or(parent);

         let (parent_class, child_class) = (parent.class(), child.class());

         match (parent_class, child_class) {

             (FlowClass::TableWrapper, FlowClass::Table) |

@@ -1962,7 +1962,7 @@ impl Legalizer {

                     } else {

                         IS_BLOCK_FLEX_ITEM

                     };

-                    let mut block = FlowRef::deref_mut(&mut block_wrapper).as_mut_block();

+                    let block = FlowRef::deref_mut(&mut block_wrapper).as_mut_block();

                     block.base.flags.insert(MARGINS_CANNOT_COLLAPSE);

                     block.fragment.flags.insert(flag);

                 }

@@ -1979,7 +1979,7 @@ impl Legalizer {

                     } else {

                         IS_BLOCK_FLEX_ITEM

                     };

-                    let mut block = FlowRef::deref_mut(child).as_mut_block();

+                    let block = FlowRef::deref_mut(child).as_mut_block();

                     block.base.flags.insert(MARGINS_CANNOT_COLLAPSE);

                     block.fragment.flags.insert(flag);

                 }

diff --git servo/components/layout/display_list_builder.rs servo/components/layout/display_list_builder.rs

index f8b26899b57d..783574afd2a3 100644

--- servo/components/layout/display_list_builder.rs

+++ servo/components/layout/display_list_builder.rs

@@ -2718,7 +2718,7 @@ impl InlineFlowDisplayListBuilding for InlineFlow {

         self.base.scroll_root_id = Some(state.current_scroll_root_id);

         self.base.clip = state.clip_stack.last().cloned().unwrap_or_else(max_rect);

-        for mut fragment in self.fragments.fragments.iter_mut() {

+        for fragment in self.fragments.fragments.iter_mut() {

             let previous_containing_block_scroll_root_id = state.containing_block_scroll_root_id;

             if establishes_containing_block_for_absolute(fragment.style.get_box().position) {

                 state.containing_block_scroll_root_id = state.current_scroll_root_id;

diff --git servo/components/layout/flex.rs servo/components/layout/flex.rs

index 353c939f58b9..d79580f8cd0d 100644

--- servo/components/layout/flex.rs

+++ servo/components/layout/flex.rs

@@ -415,7 +415,7 @@ impl FlexFlow {

         let items = &mut self.items[start..];

         let mut children = self.block_flow.base.children.random_access_mut();

-        for mut item in items {

+        for item in items {

             let kid = children.get(item.index);

             item.init_sizes(kid, container_size, self.main_mode);

             let outer_main_size = item.outer_main_size(kid, self.main_mode);

@@ -607,7 +607,7 @@ impl FlexFlow {

             let mut children = self.block_flow.base.children.random_access_mut();

             for item in items.iter_mut() {

-                let mut block = children.get(item.index).as_mut_block();

+                let block = children.get(item.index).as_mut_block();

                 block.base.block_container_writing_mode = container_mode;

                 block.base.block_container_inline_size = inline_size;

@@ -659,7 +659,7 @@ impl FlexFlow {