Backed out changeset b044f5da3670 (bug 1305402) for build bustage. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 13 Oct 2016 23:15:09 +0200
changeset 344604 a0d604653b1cfa8cead02fd81c50b951caa80d45
parent 344603 7afc2dc9016908e58ebd9fa942ef14426230a005
child 344605 332c2d9bc2151c885afea77b0f2a2b5db6b7498b
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1305402
milestone52.0a1
backs outb044f5da367000d075c25acc950193366c11262e
Backed out changeset b044f5da3670 (bug 1305402) for build bustage. r=backout on a CLOSED TREE
other-licenses/atk-1.0/atk/atk.h
other-licenses/atk-1.0/atk/atktablecell.h
--- a/other-licenses/atk-1.0/atk/atk.h
+++ b/other-licenses/atk-1.0/atk/atk.h
@@ -17,22 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __ATK_H__
 #define __ATK_H__
 
 #define __ATK_H_INSIDE__
 
-// XXX this is a Mozilla hack to avoid using atkversion.h which needs to be run
-// through m4, and we don't want to deal with that.  Fortunately we don't need
-// any of the fancyness in that header to deal with compile time version
-// detection.
-#define ATK_AVAILABLE_IN_2_12 extern
-
 #include <atk/atkobject.h>
 #include <atk/atkaction.h>
 #include <atk/atkcomponent.h>
 #include <atk/atkdocument.h>
 #include <atk/atkeditabletext.h>
 #include <atk/atkgobjectaccessible.h>
 #include <atk/atkhyperlink.h>
 #include <atk/atkhyperlinkimpl.h>
@@ -47,16 +41,15 @@
 #include <atk/atkrelationset.h>
 #include <atk/atkrelationtype.h>
 #include <atk/atkselection.h>
 #include <atk/atksocket.h>
 #include <atk/atkstate.h>
 #include <atk/atkstateset.h>
 #include <atk/atkstreamablecontent.h>
 #include <atk/atktable.h>
-#include <atk/atktablecell.h>
 #include <atk/atktext.h>
 #include <atk/atkutil.h>
 #include <atk/atkvalue.h>
 
 #undef __ATK_H_INSIDE__
 
 #endif /* __ATK_H__ */
deleted file mode 100644
--- a/other-licenses/atk-1.0/atk/atktablecell.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2014 SUSE LLC.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
-#error "Only <atk/atk.h> can be included directly."
-#endif
-
-#ifndef __ATK_TABLE_CELL_H__
-#define __ATK_TABLE_CELL_H__
-
-#include <atk/atkobject.h>
-
-G_BEGIN_DECLS
-
-#define ATK_TYPE_TABLE_CELL                    (atk_table_cell_get_type ())
-#define ATK_IS_TABLE_CELL(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE_CELL)
-#define ATK_TABLE_CELL(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE_CELL, AtkTableCell)
-#define ATK_TABLE_CELL_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TABLE_CELL, AtkTableCellIface))
-
-#ifndef _TYPEDEF_ATK_TABLE_CELL_
-#define _TYPEDEF_ATK_TABLE_CELL_
-typedef struct _AtkTableCell AtkTableCell;
-#endif
-typedef struct _AtkTableCellIface AtkTableCellIface;
-
-/**
- * AtkTableCellIface:
- * @get_column_span: virtual function that returns the number of
- * columns occupied by this cell accessible. @Since: 2.12
- * @get_column_header_cells: virtual function that returns the column
- * headers as an array of cell accessibles. @Since: 2.12
- * @get_position: virtual function that retrieves the tabular position
- * of this cell. @Since: 2.12
- * @get_row_span: virtual function that returns the number of rows
- * occupied by this cell. @Since: 2.12
- * @get_row_header_cells: virtual function that returns the row
- * headers as an array of cell accessibles. @Since: 2.12
- * @get_row_column_span: virtual function that get the row an column
- * indexes and span of this cell. @Since: 2.12
- * @get_table: virtual function that returns a reference to the
- * accessible of the containing table. @Since: 2.12
- */
-struct _AtkTableCellIface
-{
-  GTypeInterface parent;
-
-  gint          (*get_column_span)         (AtkTableCell *cell);
-  GPtrArray *   (*get_column_header_cells) (AtkTableCell *cell);
-  gboolean      (*get_position)            (AtkTableCell *cell,
-                                            gint         *row,
-                                            gint         *column);
-  gint          (*get_row_span)            (AtkTableCell *cell);
-  GPtrArray *   (*get_row_header_cells)    (AtkTableCell *cell);
-  gboolean      (*get_row_column_span)     (AtkTableCell *cell,
-                                            gint         *row,
-                                            gint         *column,
-                                            gint         *row_span,
-                                            gint         *column_span);
-  AtkObject *   (*get_table)               (AtkTableCell *cell);
-};
-
-ATK_AVAILABLE_IN_2_12
-GType atk_table_cell_get_type (void);
-
-ATK_AVAILABLE_IN_2_12
-gint        atk_table_cell_get_column_span         (AtkTableCell *cell);
-ATK_AVAILABLE_IN_2_12
-GPtrArray * atk_table_cell_get_column_header_cells (AtkTableCell *cell);
-ATK_AVAILABLE_IN_2_12
-gboolean    atk_table_cell_get_position            (AtkTableCell *cell,
-                                                    gint         *row,
-                                                    gint         *column);
-ATK_AVAILABLE_IN_2_12
-gint        atk_table_cell_get_row_span            (AtkTableCell *cell);
-ATK_AVAILABLE_IN_2_12
-GPtrArray * atk_table_cell_get_row_header_cells    (AtkTableCell *cell);
-ATK_AVAILABLE_IN_2_12
-gboolean    atk_table_cell_get_row_column_span     (AtkTableCell *cell,
-                                                    gint         *row,
-                                                    gint         *column,
-                                                    gint         *row_span,
-                                                    gint         *column_span);
-ATK_AVAILABLE_IN_2_12
-AtkObject * atk_table_cell_get_table               (AtkTableCell *cell);
-
-G_END_DECLS
-
-#endif /* __ATK_TABLE_CELL_H__ */