Bug 1265953, part 1 - Convert most of the cocoa widget code from nsAu…

…toPtr to UniquePtr. r=mstange
Brli · Apr 19, 2016 · 05e8c46 · 05e8c46
1 parent 8dfa4c3
commit 05e8c46
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 19 deletions.
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
@@ -650,10 +650,10 @@ class nsChildView : public nsBaseWidget
   CGContextRef mTitlebarCGContext;
 
   // Compositor thread only
-  nsAutoPtr<RectTextureImage> mResizerImage;
-  nsAutoPtr<RectTextureImage> mCornerMaskImage;
-  nsAutoPtr<RectTextureImage> mTitlebarImage;
-  nsAutoPtr<RectTextureImage> mBasicCompositorImage;
+  mozilla::UniquePtr<RectTextureImage> mResizerImage;
+  mozilla::UniquePtr<RectTextureImage> mCornerMaskImage;
+  mozilla::UniquePtr<RectTextureImage> mTitlebarImage;
+  mozilla::UniquePtr<RectTextureImage> mBasicCompositorImage;
 
   // The area of mTitlebarCGContext that has changed and needs to be
   // uploaded to to mTitlebarImage. Main thread only.

diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
@@ -2072,7 +2072,7 @@ inline uint16_t COLOR8TOCOLOR16(uint8_t color8)
   }
 
   if (!mResizerImage) {
-    mResizerImage = new RectTextureImage(aManager->gl());
+    mResizerImage = MakeUnique<RectTextureImage>(aManager->gl());
   }
 
   LayoutDeviceIntSize size = mResizeIndicatorRect.Size();
@@ -2286,7 +2286,7 @@ inline uint16_t COLOR8TOCOLOR16(uint8_t color8)
   mUpdatedTitlebarRegion.SetEmpty();
 
   if (!mTitlebarImage) {
-    mTitlebarImage = new RectTextureImage(aManager->gl());
+    mTitlebarImage = MakeUnique<RectTextureImage>(aManager->gl());
   }
 
   mTitlebarImage->UpdateFromCGContext(mTitlebarRect.Size(),
@@ -2310,7 +2310,7 @@ inline uint16_t COLOR8TOCOLOR16(uint8_t color8)
   MutexAutoLock lock(mEffectsLock);
 
   if (!mCornerMaskImage) {
-    mCornerMaskImage = new RectTextureImage(aManager->gl());
+    mCornerMaskImage = MakeUnique<RectTextureImage>(aManager->gl());
   }
 
   LayoutDeviceIntSize size(mDevPixelCornerRadius, mDevPixelCornerRadius);
@@ -2631,7 +2631,7 @@ static void MakeRegionsNonOverlapping(Region& aFirst, Regions& ... aRest)
   LayoutDeviceIntSize renderSize = mBounds.Size();
 
   if (!mBasicCompositorImage) {
-    mBasicCompositorImage = new RectTextureImage(mGLPresenter->gl());
+    mBasicCompositorImage = MakeUnique<RectTextureImage>(mGLPresenter->gl());
   }
 
   RefPtr<gfx::DrawTarget> drawTarget =

diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
@@ -10,9 +10,9 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "mozilla/RefPtr.h"
 #include "nsBaseWidget.h"
 #include "nsPIWidgetCocoa.h"
-#include "nsAutoPtr.h"
 #include "nsCocoaUtils.h"
 
 class nsCocoaWindow;

diff --git a/widget/cocoa/nsDeviceContextSpecX.mm b/widget/cocoa/nsDeviceContextSpecX.mm
@@ -5,10 +5,10 @@
 
 #include "nsDeviceContextSpecX.h"
 
+#include "mozilla/RefPtr.h"
 #include "nsCRT.h"
 #include <unistd.h>
 
-#include "nsAutoPtr.h"
 #include "nsQueryObject.h"
 #include "nsIServiceManager.h"
 #include "nsIPrintOptions.h"

diff --git a/widget/cocoa/nsMenuBarX.h b/widget/cocoa/nsMenuBarX.h
@@ -120,7 +120,7 @@ class nsMenuBarX : public nsMenuGroupOwnerX, public nsChangeObserver
                                             int tag, NativeMenuItemTarget* target);
   nsresult          CreateApplicationMenu(nsMenuX* inMenu);
 
-  nsTArray< nsAutoPtr<nsMenuX> > mMenuArray;
+  nsTArray<mozilla::UniquePtr<nsMenuX>> mMenuArray;
   nsIWidget*         mParentWindow;        // [weak]
   GeckoNSMenu*       mNativeMenu;            // root menu, representing entire menu bar
 };

diff --git a/widget/cocoa/nsMenuBarX.mm b/widget/cocoa/nsMenuBarX.mm
@@ -306,7 +306,7 @@
   uint32_t length = mMenuArray.Length();
   // first find a menu in the menu bar
   for (unsigned int i = 0; i < length; i++) {
-    nsMenuX* menu = mMenuArray[i];
+    nsMenuX* menu = mMenuArray[i].get();
     if (!nsMenuUtilsX::NodeIsHiddenOrCollapsed(menu->Content())) {
       visible++;
       if (visible == (targetIndex + 1)) {
@@ -366,7 +366,7 @@
     NS_ERROR("Requesting menu at invalid index!");
     return NULL;
   }
-  return mMenuArray[aIndex];
+  return mMenuArray[aIndex].get();
 }
 
 nsMenuX* nsMenuBarX::GetXULHelpMenu()

diff --git a/widget/cocoa/nsMenuGroupOwnerX.h b/widget/cocoa/nsMenuGroupOwnerX.h
@@ -12,10 +12,8 @@
 #include "nsIMutationObserver.h"
 #include "nsHashKeys.h"
 #include "nsDataHashtable.h"
-#include "nsAutoPtr.h"
 #include "nsString.h"
 
-
 class nsMenuItemX;
 class nsChangeObserver;
 class nsIWidget;

diff --git a/widget/cocoa/nsMenuItemIconX.h b/widget/cocoa/nsMenuItemIconX.h
@@ -10,8 +10,8 @@
 #ifndef nsMenuItemIconX_h_
 #define nsMenuItemIconX_h_
 
+#include "mozilla/RefPtr.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "imgINotificationObserver.h"
 
 class nsIURI;

diff --git a/widget/cocoa/nsMenuItemX.h b/widget/cocoa/nsMenuItemX.h
@@ -6,10 +6,10 @@
 #ifndef nsMenuItemX_h_
 #define nsMenuItemX_h_
 
+#include "mozilla/RefPtr.h"
 #include "nsMenuBaseX.h"
 #include "nsMenuGroupOwnerX.h"
 #include "nsChangeObserver.h"
-#include "nsAutoPtr.h"
 
 #import <Cocoa/Cocoa.h>
 

diff --git a/widget/cocoa/nsScreenManagerCocoa.h b/widget/cocoa/nsScreenManagerCocoa.h
@@ -8,8 +8,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "mozilla/RefPtr.h"
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 #include "nsIScreenManager.h"
 #include "nsScreenCocoa.h"
 

diff --git a/widget/cocoa/nsSystemStatusBarCocoa.h b/widget/cocoa/nsSystemStatusBarCocoa.h
@@ -6,9 +6,9 @@
 #ifndef nsSystemStatusBarCocoa_h_
 #define nsSystemStatusBarCocoa_h_
 
+#include "mozilla/RefPtr.h"
 #include "nsISystemStatusBar.h"
 #include "nsClassHashtable.h"
-#include "nsAutoPtr.h"
 
 class nsStandaloneNativeMenu;
 @class NSStatusItem;