Merge latest green fx-team changeset and mozilla-central; a=merge

accessible/atk/moz.build

@@ -32,11 +32,11 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../generic',
-    '../html',
-    '../xpcom',
-    '../xul',
+    '/accessible/base',
+    '/accessible/generic',
+    '/accessible/html',
+    '/accessible/xpcom',
+    '/accessible/xul',
     '/other-licenses/atk-1.0',
 ]
 

accessible/base/AccEvent.h

@@ -79,7 +79,6 @@ public:
   AccEvent(uint32_t aEventType, Accessible* aAccessible,
            EIsFromUserInput aIsFromUserInput = eAutoDetect,
            EEventRule aEventRule = eRemoveDupes);
-  virtual ~AccEvent() {}
 
   // AccEvent
   uint32_t GetEventType() const { return mEventType; }
@@ -122,6 +121,8 @@ public:
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(AccEvent)
 
 protected:
+  virtual ~AccEvent() {}
+
   bool mIsFromUserInput;
   uint32_t mEventType;
   EEventRule mEventRule;

accessible/base/DocManager.h

@@ -26,8 +26,6 @@ class DocManager : public nsIWebProgressListener,
                    public nsSupportsWeakReference
 {
 public:
-  virtual ~DocManager() { }
-
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIWEBPROGRESSLISTENER
   NS_DECL_NSIDOMEVENTLISTENER
@@ -73,6 +71,7 @@ public:
 
 protected:
   DocManager();
+  virtual ~DocManager() { }
 
   /**
    * Initialize the manager.

accessible/base/NotificationController.h

@@ -90,7 +90,6 @@ class NotificationController : public EventQueue,
 {
 public:
   NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);
-  virtual ~NotificationController();
 
   NS_IMETHOD_(MozExternalRefCountType) AddRef(void);
   NS_IMETHOD_(MozExternalRefCountType) Release(void);
@@ -183,6 +182,8 @@ public:
 #endif
 
 protected:
+  virtual ~NotificationController();
+
   nsCycleCollectingAutoRefCnt mRefCnt;
   NS_DECL_OWNINGTHREAD
 
@@ -234,7 +235,6 @@ private:
   {
   public:
     ContentInsertion(DocAccessible* aDocument, Accessible* aContainer);
-    virtual ~ContentInsertion() { mDocument = nullptr; }
 
     NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(ContentInsertion)
     NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(ContentInsertion)
@@ -242,6 +242,9 @@ private:
     bool InitChildList(nsIContent* aStartChildNode, nsIContent* aEndChildNode);
     void Process();
 
+  protected:
+    virtual ~ContentInsertion() { mDocument = nullptr; }
+
   private:
     ContentInsertion();
     ContentInsertion(const ContentInsertion&);

accessible/base/moz.build

@@ -58,10 +58,10 @@ if CONFIG['A11Y_LOG']:
     ]
 
 LOCAL_INCLUDES += [
-    '../generic',
-    '../html',
-    '../xpcom',
-    '../xul',
+    '/accessible/generic',
+    '/accessible/html',
+    '/accessible/xpcom',
+    '/accessible/xul',
     '/dom/xbl',
     '/ipc/chromium/src',
     '/layout/generic',
@@ -73,20 +73,20 @@ LOCAL_INCLUDES += [
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
-        '../atk',
+        '/accessible/atk',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
-        '../windows/ia2',
-        '../windows/msaa',
+        '/accessible/windows/ia2',
+        '/accessible/windows/msaa',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LOCAL_INCLUDES += [
-        '../mac',
+        '/accessible/mac',
     ]
 else:
     LOCAL_INCLUDES += [
-        '../other',
+        '/accessible/other',
     ]
 
 FINAL_LIBRARY = 'xul'

accessible/base/nsAccessiblePivot.cpp

@@ -45,6 +45,10 @@ nsAccessiblePivot::nsAccessiblePivot(Accessible* aRoot) :
   NS_ASSERTION(aRoot, "A root accessible is required");
 }
 
+nsAccessiblePivot::~nsAccessiblePivot()
+{
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 

accessible/base/nsAccessiblePivot.h

@@ -38,6 +38,7 @@ public:
   Accessible* Position() { return mPosition; }
 
 private:
+  ~nsAccessiblePivot();
   nsAccessiblePivot() MOZ_DELETE;
   nsAccessiblePivot(const nsAccessiblePivot&) MOZ_DELETE;
   void operator = (const nsAccessiblePivot&) MOZ_DELETE;