Bug 1194751 - Part 1. Remove nsIScreenManager::GetNumberOfScreens. r=jimm

It's not used anywhere. Remove it will make removing PScreenManager
easier.

MozReview-Commit-ID: 5dn8kDhTZVl

--HG--
extra : rebase_source : 96b8ddb18deee94ca256bfa118b60ceacfd2d677

dom/ipc/ContentChild.cpp

@@ -1749,8 +1749,7 @@ ContentChild::DeallocPParentToChildStreamChild(PParentToChildStreamChild* aActor
 }
 
 PScreenManagerChild*
-ContentChild::AllocPScreenManagerChild(uint32_t* aNumberOfScreens,
-                                       float* aSystemDefaultScale,
+ContentChild::AllocPScreenManagerChild(float* aSystemDefaultScale,
                                        bool* aSuccess)
 {
   // The ContentParent should never attempt to allocate the

dom/ipc/ContentChild.h

@@ -243,8 +243,7 @@ public:
   virtual bool DeallocPParentToChildStreamChild(PParentToChildStreamChild*) override;
 
   virtual PScreenManagerChild*
-  AllocPScreenManagerChild(uint32_t* aNumberOfScreens,
-                           float* aSystemDefaultScale,
+  AllocPScreenManagerChild(float* aSystemDefaultScale,
                            bool* aSuccess) override;
 
   virtual bool DeallocPScreenManagerChild(PScreenManagerChild*) override;

dom/ipc/ContentParent.cpp

@@ -3137,11 +3137,10 @@ ContentParent::DeallocPParentToChildStreamParent(PParentToChildStreamParent* aAc
 }
 
 PScreenManagerParent*
-ContentParent::AllocPScreenManagerParent(uint32_t* aNumberOfScreens,
-                                         float* aSystemDefaultScale,
+ContentParent::AllocPScreenManagerParent(float* aSystemDefaultScale,
                                          bool* aSuccess)
 {
-  return new ScreenManagerParent(aNumberOfScreens, aSystemDefaultScale, aSuccess);
+  return new ScreenManagerParent(aSystemDefaultScale, aSuccess);
 }
 
 bool

dom/ipc/ContentParent.h

@@ -447,8 +447,7 @@ public:
   DeallocPParentToChildStreamParent(PParentToChildStreamParent* aActor) override;
 
   virtual PScreenManagerParent*
-  AllocPScreenManagerParent(uint32_t* aNumberOfScreens,
-                            float* aSystemDefaultScale,
+  AllocPScreenManagerParent(float* aSystemDefaultScale,
                             bool* aSuccess) override;
 
   virtual bool

dom/ipc/PContent.ipdl

@@ -712,8 +712,7 @@ parent:
     async PChildToParentStream();
 
     nested(inside_sync) sync PScreenManager()
-        returns (uint32_t numberOfScreens,
-                 float systemDefaultScale,
+        returns (float systemDefaultScale,
                  bool success);
 
     async PSpeechSynthesis();

dom/ipc/PScreenManager.ipdl

@@ -32,8 +32,7 @@ nested(upto inside_cpow) sync protocol PScreenManager
 
 parent:
     nested(inside_sync) sync Refresh()
-      returns (uint32_t numberOfScreens,
-               float systemDefaultScale,
+      returns (float systemDefaultScale,
                bool success);
 
     nested(inside_cpow) sync ScreenRefresh(uint32_t aId)

dom/ipc/ScreenManagerParent.cpp

@@ -17,8 +17,7 @@ namespace dom {
 
 static const char *sScreenManagerContractID = "@mozilla.org/gfx/screenmanager;1";
 
-ScreenManagerParent::ScreenManagerParent(uint32_t* aNumberOfScreens,
-                                         float* aSystemDefaultScale,
+ScreenManagerParent::ScreenManagerParent(float* aSystemDefaultScale,
                                          bool* aSuccess)
 {
   mScreenMgr = do_GetService(sScreenManagerContractID);
@@ -26,22 +25,16 @@ ScreenManagerParent::ScreenManagerParent(uint32_t* aNumberOfScreens,
     MOZ_CRASH("Couldn't get nsIScreenManager from ScreenManagerParent.");
   }
 
-  Unused << RecvRefresh(aNumberOfScreens, aSystemDefaultScale, aSuccess);
+  Unused << RecvRefresh(aSystemDefaultScale, aSuccess);
 }
 
 mozilla::ipc::IPCResult
-ScreenManagerParent::RecvRefresh(uint32_t* aNumberOfScreens,
-                                 float* aSystemDefaultScale,
+ScreenManagerParent::RecvRefresh(float* aSystemDefaultScale,
                                  bool* aSuccess)
 {
   *aSuccess = false;
 
-  nsresult rv = mScreenMgr->GetNumberOfScreens(aNumberOfScreens);
-  if (NS_FAILED(rv)) {
-    return IPC_OK();
-  }
-
-  rv = mScreenMgr->GetSystemDefaultScale(aSystemDefaultScale);
+  nsresult rv = mScreenMgr->GetSystemDefaultScale(aSystemDefaultScale);
   if (NS_FAILED(rv)) {
     return IPC_OK();
   }

dom/ipc/ScreenManagerParent.h

@@ -16,13 +16,11 @@ namespace dom {
 class ScreenManagerParent : public PScreenManagerParent
 {
  public:
-  ScreenManagerParent(uint32_t* aNumberOfScreens,
-                      float* aSystemDefaultScale,
+  ScreenManagerParent(float* aSystemDefaultScale,
                       bool* aSuccess);
   ~ScreenManagerParent() {};
 
-  virtual mozilla::ipc::IPCResult RecvRefresh(uint32_t* aNumberOfScreens,
-                                              float* aSystemDefaultScale,
+  virtual mozilla::ipc::IPCResult RecvRefresh(float* aSystemDefaultScale,
                                               bool* aSuccess) override;
 
   virtual mozilla::ipc::IPCResult RecvScreenRefresh(const uint32_t& aId,

widget/PuppetWidget.cpp

@@ -1454,13 +1454,6 @@ PuppetScreenManager::ScreenForNativeWidget(void* aWidget,
   return GetPrimaryScreen(outScreen);
 }
 
-NS_IMETHODIMP
-PuppetScreenManager::GetNumberOfScreens(uint32_t* aNumberOfScreens)
-{
-  *aNumberOfScreens = 1;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 PuppetScreenManager::GetSystemDefaultScale(float *aDefaultScale)
 {

widget/android/nsScreenManagerAndroid.cpp

@@ -227,13 +227,6 @@ nsScreenManagerAndroid::ScreenForNativeWidget(void *aWidget, nsIScreen **outScre
     return GetPrimaryScreen(outScreen);
 }
 
-NS_IMETHODIMP
-nsScreenManagerAndroid::GetNumberOfScreens(uint32_t *aNumberOfScreens)
-{
-    *aNumberOfScreens = mScreens.Length();
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 nsScreenManagerAndroid::GetSystemDefaultScale(float *aDefaultScale)
 {

widget/cocoa/nsScreenManagerCocoa.mm

@@ -111,20 +111,6 @@ nsScreenManagerCocoa::GetPrimaryScreen (nsIScreen **outScreen)
     NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-NS_IMETHODIMP
-nsScreenManagerCocoa::GetNumberOfScreens (uint32_t *aNumberOfScreens)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    NSArray *ss = [NSScreen screens];
-
-    *aNumberOfScreens = [ss count];
-
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
 NS_IMETHODIMP
 nsScreenManagerCocoa::GetSystemDefaultScale(float *aDefaultScale)
 {

widget/gonk/nsScreenManagerGonk.cpp

@@ -885,13 +885,6 @@ nsScreenManagerGonk::ScreenForNativeWidget(void *aWidget, nsIScreen **outScreen)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsScreenManagerGonk::GetNumberOfScreens(uint32_t *aNumberOfScreens)
-{
-    *aNumberOfScreens = mScreens.Length();
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 nsScreenManagerGonk::GetSystemDefaultScale(float *aDefaultScale)
 {

widget/gtk/nsScreenManagerGtk.cpp

@@ -304,26 +304,6 @@ nsScreenManagerGtk :: GetPrimaryScreen(nsIScreen * *aPrimaryScreen)
 
 } // GetPrimaryScreen
 
-
-//
-// GetNumberOfScreens
-//
-// Returns how many physical screens are available.
-//
-NS_IMETHODIMP
-nsScreenManagerGtk :: GetNumberOfScreens(uint32_t *aNumberOfScreens)
-{
-  nsresult rv;
-  rv = EnsureInit();
-  if (NS_FAILED(rv)) {
-    NS_ERROR("nsScreenManagerGtk::EnsureInit() failed from GetNumberOfScreens");
-    return rv;
-  }
-  *aNumberOfScreens = mCachedScreenArray.Count();
-  return NS_OK;
-
-} // GetNumberOfScreens
-
 NS_IMETHODIMP
 nsScreenManagerGtk::GetSystemDefaultScale(float *aDefaultScale)
 {

widget/nsIScreenManager.idl

@@ -29,9 +29,6 @@ interface nsIScreenManager : nsISupports
     // often.
   readonly attribute nsIScreen primaryScreen;
 
-    // Holds the number of screens that are available
-  readonly attribute unsigned long numberOfScreens;
-
     // The default DPI scaling factor of the screen environment (number of
     // screen pixels corresponding to 1 CSS px, at the default zoom level).
     //

widget/nsScreenManagerProxy.cpp

@@ -23,15 +23,13 @@ using namespace mozilla::widget;
 NS_IMPL_ISUPPORTS(nsScreenManagerProxy, nsIScreenManager)
 
 nsScreenManagerProxy::nsScreenManagerProxy()
-  : mNumberOfScreens(-1)
-  , mSystemDefaultScale(1.0)
+  : mSystemDefaultScale(1.0)
   , mCacheValid(true)
   , mCacheWillInvalidate(false)
 {
   bool success = false;
   Unused << ContentChild::GetSingleton()->SendPScreenManagerConstructor(
                                             this,
-                                            &mNumberOfScreens,
                                             &mSystemDefaultScale,
                                             &success);
 
@@ -146,17 +144,6 @@ nsScreenManagerProxy::ScreenForNativeWidget(void* aWidget,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsScreenManagerProxy::GetNumberOfScreens(uint32_t* aNumberOfScreens)
-{
-  if (!EnsureCacheIsValid()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aNumberOfScreens = mNumberOfScreens;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsScreenManagerProxy::GetSystemDefaultScale(float *aSystemDefaultScale)
 {
@@ -178,7 +165,7 @@ nsScreenManagerProxy::EnsureCacheIsValid()
   bool success = false;
   // Kick off a synchronous IPC call to the parent to get the
   // most up-to-date information.
-  Unused << SendRefresh(&mNumberOfScreens, &mSystemDefaultScale, &success);
+  Unused << SendRefresh(&mSystemDefaultScale, &success);
   if (!success) {
     NS_WARNING("Refreshing nsScreenManagerProxy failed in the parent process.");
     return false;

widget/nsScreenManagerProxy.h

@@ -39,7 +39,6 @@ private:
   void InvalidateCacheOnNextTick();
   void InvalidateCache();
 
-  uint32_t mNumberOfScreens;
   float mSystemDefaultScale;
   bool mCacheValid;
   bool mCacheWillInvalidate;

widget/uikit/nsScreenManager.mm

@@ -130,14 +130,6 @@ UIKitScreenManager::ScreenForNativeWidget(void* aWidget, nsIScreen** outScreen)
   return GetPrimaryScreen(outScreen);
 }
 
-NS_IMETHODIMP
-UIKitScreenManager::GetNumberOfScreens(uint32_t* aNumberOfScreens)
-{
-  //TODO: support multiple screens
-  *aNumberOfScreens = 1;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 UIKitScreenManager::GetSystemDefaultScale(float* aScale)
 {

widget/windows/nsScreenManagerWin.cpp

@@ -123,47 +123,6 @@ nsScreenManagerWin::GetPrimaryScreen(nsIScreen** aPrimaryScreen)
   
 } // GetPrimaryScreen
 
-
-//
-// CountMonitors
-//
-// Will be called once for every monitor in the system. Just 
-// increments the parameter, which holds a ptr to a PRUin32 holding the
-// count up to this point.
-//
-BOOL CALLBACK
-CountMonitors(HMONITOR, HDC, LPRECT, LPARAM ioParam)
-{
-  uint32_t* countPtr = reinterpret_cast<uint32_t*>(ioParam);
-  ++(*countPtr);
-
-  return TRUE; // continue the enumeration
-
-} // CountMonitors
-
-
-//
-// GetNumberOfScreens
-//
-// Returns how many physical screens are available.
-//
-NS_IMETHODIMP
-nsScreenManagerWin::GetNumberOfScreens(uint32_t *aNumberOfScreens)
-{
-  if (mNumberOfScreens)
-    *aNumberOfScreens = mNumberOfScreens;
-  else {
-    uint32_t count = 0;
-    BOOL result = ::EnumDisplayMonitors(nullptr, nullptr, (MONITORENUMPROC)CountMonitors, (LPARAM)&count);
-    if (!result)
-      return NS_ERROR_FAILURE;
-    *aNumberOfScreens = mNumberOfScreens = count;
-  }
-
-  return NS_OK;
-  
-} // GetNumberOfScreens
-
 NS_IMETHODIMP
 nsScreenManagerWin::GetSystemDefaultScale(float *aDefaultScale)
 {