Issue #1751 - Remove Mac code behind MOZ_WIDGET_TOOLKIT == 'cocoa'

9 files changed, 0 insertions, 525 deletions

diff --git a/embedding/components/build/moz.build b/embedding/components/build/moz.build
index 361fd8768a..c66f0c79ee 100644
--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -22,11 +22,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
         '../printingui/win',
     ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    DEFINES['PROXY_PRINTING'] = 1
-    LOCAL_INCLUDES += [
-        '../printingui/mac',
-    ]
 
 if CONFIG['MOZ_PDF_PRINTING']:
     DEFINES['PROXY_PRINTING'] = 1
diff --git a/embedding/components/printingui/mac/moz.build b/embedding/components/printingui/mac/moz.build
deleted file mode 100644
index c2fe2f4731..0000000000
--- a/embedding/components/printingui/mac/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-UNIFIED_SOURCES += [
-    'nsPrintProgress.cpp',
-    'nsPrintProgressParams.cpp',
-]
-
-SOURCES += [
-    'nsPrintingPromptServiceX.mm',
-]
-
-FINAL_LIBRARY = 'xul'
diff --git a/embedding/components/printingui/mac/nsPrintProgress.cpp b/embedding/components/printingui/mac/nsPrintProgress.cpp
deleted file mode 100644
index 0ae0a63d9a..0000000000
--- a/embedding/components/printingui/mac/nsPrintProgress.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsPrintProgress.h"
-
-#include "nsIBaseWindow.h"
-#include "nsXPCOM.h"
-#include "nsISupportsPrimitives.h"
-#include "nsIComponentManager.h"
-#include "nsPIDOMWindow.h"
-
-NS_IMPL_ADDREF(nsPrintProgress)
-NS_IMPL_RELEASE(nsPrintProgress)
-
-NS_INTERFACE_MAP_BEGIN(nsPrintProgress)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIPrintStatusFeedback)
-   NS_INTERFACE_MAP_ENTRY(nsIPrintProgress)
-   NS_INTERFACE_MAP_ENTRY(nsIPrintStatusFeedback)
-   NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
-NS_INTERFACE_MAP_END_THREADSAFE
-
-
-nsPrintProgress::nsPrintProgress()
-{
-  m_closeProgress = false;
-  m_processCanceled = false;
-  m_pendingStateFlags = -1;
-  m_pendingStateValue = NS_OK;
-}
-
-nsPrintProgress::~nsPrintProgress()
-{
-  (void)ReleaseListeners();
-}
-
-NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(mozIDOMWindowProxy *parent,
-                                                  const char *dialogURL,
-                                                  nsISupports *parameters, 
-                                                  nsIObserver *openDialogObserver,
-                                                  bool *notifyOnOpen)
-{
-  MOZ_ASSERT_UNREACHABLE("The nsPrintingPromptService::ShowProgress "
-                         "implementation for OS X returns "
-                         "NS_ERROR_NOT_IMPLEMENTED, so we should never get "
-                         "here.");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose)
-{
-  MOZ_ASSERT_UNREACHABLE("The nsPrintingPromptService::ShowProgress "
-                         "implementation for OS X returns "
-                         "NS_ERROR_NOT_IMPLEMENTED, so we should never get "
-                         "here.");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval)
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-  *_retval = nullptr;
-
-  if (! m_closeProgress && m_dialog) {
-    nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryInterface(m_dialog);
-    MOZ_ASSERT(window);
-    return window->GetPrompter(_retval);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsPrintProgress::GetProcessCanceledByUser(bool *aProcessCanceledByUser)
-{
-  NS_ENSURE_ARG_POINTER(aProcessCanceledByUser);
-  *aProcessCanceledByUser = m_processCanceled;
-  return NS_OK;
-}
-NS_IMETHODIMP nsPrintProgress::SetProcessCanceledByUser(bool aProcessCanceledByUser)
-{
-  m_processCanceled = aProcessCanceledByUser;
-  OnStateChange(nullptr, nullptr, nsIWebProgressListener::STATE_STOP, NS_OK);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listener)
-{
-  if (!listener) //Nothing to do with a null listener!
-    return NS_OK;
-  
-  m_listenerList.AppendObject(listener);
-  if (m_closeProgress || m_processCanceled)
-    listener->OnStateChange(nullptr, nullptr,
-                            nsIWebProgressListener::STATE_STOP, NS_OK);
-  else
-  {
-    listener->OnStatusChange(nullptr, nullptr, NS_OK, m_pendingStatus.get());
-    if (m_pendingStateFlags != -1)
-      listener->OnStateChange(nullptr, nullptr, m_pendingStateFlags, m_pendingStateValue);
-  }
-    
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listener)
-{
-  if (listener)
-    m_listenerList.RemoveObject(listener);
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::DoneIniting()
-{
-  if (m_observer) {
-    m_observer->Observe(nullptr, nullptr, nullptr);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t aStateFlags, nsresult aStatus)
-{
-  m_pendingStateFlags = aStateFlags;
-  m_pendingStateValue = aStatus;
-  
-  uint32_t count = m_listenerList.Count();
-  for (uint32_t i = count - 1; i < count; i --)
-  {
-    nsCOMPtr<nsIWebProgressListener> progressListener = m_listenerList.SafeObjectAt(i);
-    if (progressListener)
-      progressListener->OnStateChange(aWebProgress, aRequest, aStateFlags, aStatus);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, int32_t aCurSelfProgress, int32_t aMaxSelfProgress, int32_t aCurTotalProgress, int32_t aMaxTotalProgress)
-{
-  uint32_t count = m_listenerList.Count();
-  for (uint32_t i = count - 1; i < count; i --)
-  {
-    nsCOMPtr<nsIWebProgressListener> progressListener = m_listenerList.SafeObjectAt(i);
-    if (progressListener)
-      progressListener->OnProgressChange(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location, uint32_t aFlags)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage)
-{
-  if (aMessage && *aMessage)
-  m_pendingStatus = aMessage;
-
-  uint32_t count = m_listenerList.Count();
-  for (uint32_t i = count - 1; i < count; i --)
-  {
-    nsCOMPtr<nsIWebProgressListener> progressListener = m_listenerList.SafeObjectAt(i);
-    if (progressListener)
-      progressListener->OnStatusChange(aWebProgress, aRequest, aStatus, aMessage);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state)
-{
-    return NS_OK;
-}
-
-nsresult nsPrintProgress::ReleaseListeners()
-{
-  m_listenerList.Clear();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgress::ShowStatusString(const char16_t *status)
-{
-  return OnStatusChange(nullptr, nullptr, NS_OK, status);
-}
-
-NS_IMETHODIMP nsPrintProgress::StartMeteors()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsPrintProgress::StopMeteors()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsPrintProgress::ShowProgress(int32_t percent)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsPrintProgress::SetDocShell(nsIDocShell *shell,
-                                           mozIDOMWindowProxy *window)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsPrintProgress::CloseWindow()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
diff --git a/embedding/components/printingui/mac/nsPrintProgress.h b/embedding/components/printingui/mac/nsPrintProgress.h
deleted file mode 100644
index 938558c3e1..0000000000
--- a/embedding/components/printingui/mac/nsPrintProgress.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __nsPrintProgress_h
-#define __nsPrintProgress_h
-
-#include "nsIPrintProgress.h"
-
-#include "nsCOMArray.h"
-#include "nsCOMPtr.h"
-#include "nsIPrintStatusFeedback.h"
-#include "nsIObserver.h"
-#include "nsString.h"
-
-class nsPrintProgress : public nsIPrintProgress, public nsIPrintStatusFeedback
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIPRINTPROGRESS
-  NS_DECL_NSIWEBPROGRESSLISTENER
-  NS_DECL_NSIPRINTSTATUSFEEDBACK
-
-  nsPrintProgress();
-
-protected:
-  virtual ~nsPrintProgress();
-
-private:
-  nsresult ReleaseListeners();
-
-  bool                              m_closeProgress;
-  bool                              m_processCanceled;
-  nsString                          m_pendingStatus;
-  int32_t                           m_pendingStateFlags;
-  nsresult                          m_pendingStateValue;
-  // XXX This member is read-only.
-  nsCOMPtr<mozIDOMWindowProxy>      m_dialog;
-  nsCOMArray<nsIWebProgressListener>        m_listenerList;
-  nsCOMPtr<nsIObserver>             m_observer;
-};
-
-#endif
diff --git a/embedding/components/printingui/mac/nsPrintProgressParams.cpp b/embedding/components/printingui/mac/nsPrintProgressParams.cpp
deleted file mode 100644
index eba86b2987..0000000000
--- a/embedding/components/printingui/mac/nsPrintProgressParams.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsPrintProgressParams.h"
-#include "nsReadableUtils.h"
-
-
-NS_IMPL_ISUPPORTS(nsPrintProgressParams, nsIPrintProgressParams)
-
-nsPrintProgressParams::nsPrintProgressParams()
-{
-}
-
-nsPrintProgressParams::~nsPrintProgressParams()
-{
-}
-
-NS_IMETHODIMP nsPrintProgressParams::GetDocTitle(char16_t * *aDocTitle)
-{
-  NS_ENSURE_ARG(aDocTitle);
-  
-  *aDocTitle = ToNewUnicode(mDocTitle);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgressParams::SetDocTitle(const char16_t * aDocTitle)
-{
-  mDocTitle = aDocTitle;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgressParams::GetDocURL(char16_t * *aDocURL)
-{
-  NS_ENSURE_ARG(aDocURL);
-  
-  *aDocURL = ToNewUnicode(mDocURL);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintProgressParams::SetDocURL(const char16_t * aDocURL)
-{
-  mDocURL = aDocURL;
-  return NS_OK;
-}
-
diff --git a/embedding/components/printingui/mac/nsPrintProgressParams.h b/embedding/components/printingui/mac/nsPrintProgressParams.h
deleted file mode 100644
index 65c00d98f0..0000000000
--- a/embedding/components/printingui/mac/nsPrintProgressParams.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __nsPrintProgressParams_h
-#define __nsPrintProgressParams_h
-
-#include "nsIPrintProgressParams.h"
-#include "nsString.h"
-
-class nsPrintProgressParams : public nsIPrintProgressParams
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIPRINTPROGRESSPARAMS
-
-  nsPrintProgressParams();
-
-protected:
-  virtual ~nsPrintProgressParams();
-
-private:
-  nsString mDocTitle;
-  nsString mDocURL;
-};
-
-#endif
diff --git a/embedding/components/printingui/mac/nsPrintingPromptService.h b/embedding/components/printingui/mac/nsPrintingPromptService.h
deleted file mode 100644
index 0334db2230..0000000000
--- a/embedding/components/printingui/mac/nsPrintingPromptService.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __nsPrintingPromptService_h
-#define __nsPrintingPromptService_h
-
-// {E042570C-62DE-4bb6-A6E0-798E3C07B4DF}
-#define NS_PRINTINGPROMPTSERVICE_CID \
- {0xe042570c, 0x62de, 0x4bb6, { 0xa6, 0xe0, 0x79, 0x8e, 0x3c, 0x7, 0xb4, 0xdf}}
-#define NS_PRINTINGPROMPTSERVICE_CONTRACTID \
- "@mozilla.org/embedcomp/printingprompt-service;1"
-
-#include "nsCOMPtr.h"
-#include "nsIPrintingPromptService.h"
-#include "nsPIPromptService.h"
-#include "nsIWindowWatcher.h"
-
-// Printing Progress Includes
-#include "nsPrintProgress.h"
-#include "nsIWebProgressListener.h"
-
-class nsPrintingPromptService: public nsIPrintingPromptService,
-                               public nsIWebProgressListener
-{
-public:
-  nsPrintingPromptService();
-
-  nsresult Init();
-
-  NS_DECL_NSIPRINTINGPROMPTSERVICE
-  NS_DECL_NSIWEBPROGRESSLISTENER
-  NS_DECL_ISUPPORTS
-
-protected:
-  virtual ~nsPrintingPromptService();
-
-private:
-  nsCOMPtr<nsIPrintProgress> mPrintProgress;
-};
-
-#endif
diff --git a/embedding/components/printingui/mac/nsPrintingPromptServiceX.mm b/embedding/components/printingui/mac/nsPrintingPromptServiceX.mm
deleted file mode 100644
index 3b956100be..0000000000
--- a/embedding/components/printingui/mac/nsPrintingPromptServiceX.mm
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsPrintingPromptService.h"
-
-#include "nsCOMPtr.h"
-#include "nsServiceManagerUtils.h"
-#include "nsObjCExceptions.h"
-
-#include "nsIPrintingPromptService.h"
-#include "nsIFactory.h"
-#include "nsIPrintDialogService.h"
-#include "nsPIDOMWindow.h"
-
-//*****************************************************************************
-// nsPrintingPromptService
-//*****************************************************************************   
-
-NS_IMPL_ISUPPORTS(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener)
-
-nsPrintingPromptService::nsPrintingPromptService()
-{
-}
-
-nsPrintingPromptService::~nsPrintingPromptService()
-{
-}
-
-nsresult nsPrintingPromptService::Init()
-{
-    return NS_OK;
-}
-
-//*****************************************************************************
-// nsPrintingPromptService::nsIPrintingPromptService
-//*****************************************************************************   
-
-NS_IMETHODIMP 
-nsPrintingPromptService::ShowPrintDialog(mozIDOMWindowProxy *parent, nsIWebBrowserPrint *webBrowserPrint, nsIPrintSettings *printSettings)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsCOMPtr<nsIPrintDialogService> dlgPrint(do_GetService(
-                                           NS_PRINTDIALOGSERVICE_CONTRACTID));
-  if (dlgPrint) {
-    return dlgPrint->Show(nsPIDOMWindowOuter::From(parent), printSettings,
-                          webBrowserPrint);
-  }
-
-  return NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP 
-nsPrintingPromptService::ShowProgress(mozIDOMWindowProxy*      parent,
-                                      nsIWebBrowserPrint*      webBrowserPrint,    // ok to be null
-                                      nsIPrintSettings*        printSettings,      // ok to be null
-                                      nsIObserver*             openDialogObserver, // ok to be null
-                                      bool                     isForPrinting,
-                                      nsIWebProgressListener** webProgressListener,
-                                      nsIPrintProgressParams** printProgressParams,
-                                      bool*                  notifyOnOpen)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP 
-nsPrintingPromptService::ShowPageSetup(mozIDOMWindowProxy *parent, nsIPrintSettings *printSettings, nsIObserver *aObs)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-  nsCOMPtr<nsIPrintDialogService> dlgPrint(do_GetService(
-                                           NS_PRINTDIALOGSERVICE_CONTRACTID));
-  if (dlgPrint) {
-    return dlgPrint->ShowPageSetup(nsPIDOMWindowOuter::From(parent), printSettings);
-  }
-
-  return NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP 
-nsPrintingPromptService::ShowPrinterProperties(mozIDOMWindowProxy *parent, const char16_t *printerName, nsIPrintSettings *printSettings)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-//*****************************************************************************
-// nsPrintingPromptService::nsIWebProgressListener
-//*****************************************************************************   
-
-NS_IMETHODIMP 
-nsPrintingPromptService::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t aStateFlags, nsresult aStatus)
-{
-    return NS_OK;
-}
-
-/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
-NS_IMETHODIMP 
-nsPrintingPromptService::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, int32_t aCurSelfProgress, int32_t aMaxSelfProgress, int32_t aCurTotalProgress, int32_t aMaxTotalProgress)
-{
-    return NS_OK;
-}
-
-/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location, in unsigned long aFlags); */
-NS_IMETHODIMP 
-nsPrintingPromptService::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location, uint32_t aFlags)
-{
-    return NS_OK;
-}
-
-/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
-NS_IMETHODIMP 
-nsPrintingPromptService::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage)
-{
-    return NS_OK;
-}
-
-/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */
-NS_IMETHODIMP 
-nsPrintingPromptService::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state)
-{
-    return NS_OK;
-}
diff --git a/embedding/components/printingui/moz.build b/embedding/components/printingui/moz.build
index c75471555e..e0d6316931 100644
--- a/embedding/components/printingui/moz.build
+++ b/embedding/components/printingui/moz.build
@@ -10,7 +10,5 @@ DIRS += ['ipc']
 if CONFIG['NS_PRINTING']:
     if toolkit == 'windows':
         DIRS += ['win']
-    elif toolkit == 'cocoa':
-        DIRS += ['mac']
     elif CONFIG['MOZ_PDF_PRINTING']:
         DIRS += ['unixshared']