Backed out changeset 21b263335af5 (bug 945097) for mochitest-8 bustage on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 04 Dec 2013 09:23:15 +0100
changeset 173465 89409f6726e6e50137cd72c8081b0a0c99187873
parent 173464 65bdf48eb148cadb797dc51a8baa5227352a887c
child 173466 c18738d7ee310a617dd020baaa59fabfe7d82cbd
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs945097
milestone28.0a1
backs out21b263335af58ee73f156340039b37d6fd5d27d0
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
Backed out changeset 21b263335af5 (bug 945097) for mochitest-8 bustage on a CLOSED TREE
widget/gtk/maiRedundantObjectFactory.c
widget/gtk/moz.build
widget/gtk/mozcontainer.c
--- a/widget/gtk/maiRedundantObjectFactory.c
+++ b/widget/gtk/maiRedundantObjectFactory.c
@@ -10,16 +10,18 @@
 
 static void mai_redundant_object_factory_class_init (
                               maiRedundantObjectFactoryClass *klass);
 
 static AtkObject* mai_redundant_object_factory_create_accessible (
                               GObject *obj);
 static GType mai_redundant_object_factory_get_accessible_type (void);
 
+static gpointer parent_class = NULL;
+
 GType
 mai_redundant_object_factory_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
   {
     static const GTypeInfo tinfo =
@@ -43,16 +45,18 @@ mai_redundant_object_factory_get_type (v
   return type;
 }
 
 static void
 mai_redundant_object_factory_class_init (maiRedundantObjectFactoryClass *klass)
 {
   AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS (klass);
 
+  parent_class = g_type_class_peek_parent (klass);
+
   class->create_accessible = mai_redundant_object_factory_create_accessible;
   class->get_accessible_type = mai_redundant_object_factory_get_accessible_type;
 }
 
 /**
  * mai_redundant_object_factory_new:
  *
  * Creates an instance of an #AtkObjectFactory which generates primitive
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -10,82 +10,75 @@ else:
     LIBRARY_NAME = 'widget_gtk3'
 
 EXPORTS += [
     'mozcontainer.h',
     'nsGTKToolkit.h',
     'nsIImageToPixbuf.h',
 ]
 
-UNIFIED_SOURCES += [
-    'mozcontainer.c',
+SOURCES += [
+    'nsAppShell.cpp',
     'nsBidiKeyboard.cpp',
     'nsColorPicker.cpp',
     'nsFilePicker.cpp',
+    'nsGtkIMModule.cpp',
     'nsGtkKeyUtils.cpp',
     'nsImageToPixbuf.cpp',
     'nsLookAndFeel.cpp',
     'nsNativeKeyBindings.cpp',
     'nsNativeThemeGTK.cpp',
     'nsScreenGtk.cpp',
     'nsScreenManagerGtk.cpp',
     'nsSound.cpp',
     'nsToolkit.cpp',
+    'nsWidgetFactory.cpp',
+    'nsWindow.cpp',
     'WidgetTraceEvent.cpp',
 ]
 
-# These files force-enable NSPR logging and thus cannot be built in unified mode
-SOURCES += [
-    'nsAppShell.cpp',
-    'nsGtkIMModule.cpp',
-    'nsWidgetFactory.cpp',
-    'nsWindow.cpp',
-]
-
 if CONFIG['MOZ_X11']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsIdleServiceGTK.cpp',
     ]
 
 if CONFIG['NS_PRINTING']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsCUPSShim.cpp',
+        'nsDeviceContextSpecG.cpp',
         'nsPaperPS.cpp',
         'nsPrintDialogGTK.cpp',
         'nsPrintOptionsGTK.cpp',
         'nsPrintSettingsGTK.cpp',
         'nsPSPrinters.cpp',
     ]
-    # This file force-enables NSPR logging and thus cannot be built in unified mode
-    SOURCES += [
-        'nsDeviceContextSpecG.cpp',
-    ]
 
 if CONFIG['MOZ_X11']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsClipboard.cpp',
-    ]
-    # This file force-enables NSPR logging and thus cannot be built in unified mode
-    SOURCES += [
         'nsDragService.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
+SOURCES += [
+    'mozcontainer.c',
+]
+
 if CONFIG['ACCESSIBILITY']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'maiRedundantObjectFactory.c',
     ]
 
 if CONFIG['MOZ_ENABLE_GTK2']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'gtk2drawing.c',
     ]
 else:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'gtk3drawing.c',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
--- a/widget/gtk/mozcontainer.c
+++ b/widget/gtk/mozcontainer.c
@@ -43,16 +43,18 @@ struct _MozContainerChild {
     gint y;
 };
 
 static void moz_container_allocate_child (MozContainer      *container,
                                           MozContainerChild *child);
 static MozContainerChild *
 moz_container_get_child (MozContainer *container, GtkWidget *child);
 
+static GtkContainerClass *parent_class = NULL;
+
 /* public methods */
 
 GType
 moz_container_get_type(void)
 {
     static GType moz_container_type = 0;
 
     if (!moz_container_type) {
@@ -146,16 +148,18 @@ moz_container_move (MozContainer *contai
 void
 moz_container_class_init (MozContainerClass *klass)
 {
     /*GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
       GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); */
     GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+    parent_class = g_type_class_peek_parent (klass);
+
     widget_class->map = moz_container_map;
     widget_class->unmap = moz_container_unmap;
     widget_class->realize = moz_container_realize;
     widget_class->size_allocate = moz_container_size_allocate;
 
     container_class->remove = moz_container_remove;
     container_class->forall = moz_container_forall;
     container_class->add = moz_container_add;