Bug 1480607 - Remove nsCWebBrowser and nsCWebBrowserPersist; r=nika
authorKyle Machulis <kyle@nonpolynomial.com>
Tue, 07 Aug 2018 01:10:31 +0000
changeset 485380 a89f17d30427745d1755ad123babc2fbfde73a97
parent 485379 46cf1090208659eb072c8f7b33cf783171793a1e
child 485381 8f69423e522dc1e926b1d4d029945d6bf1ce36ab
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnika
bugs1480607
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1480607 - Remove nsCWebBrowser and nsCWebBrowserPersist; r=nika It doesn't appear these IDL files have had interfaces in them since before the Netscape import, and were mostly just hanging around because they contained some IDs needed elsewhere. Move the IDs somewhere more appropriate and remove files. MozReview-Commit-ID: AINtTerqHu1 Differential Revision: https://phabricator.services.mozilla.com/D2688
dom/webbrowserpersist/moz.build
dom/webbrowserpersist/nsCWebBrowserPersist.idl
dom/webbrowserpersist/nsIWebBrowserPersist.idl
dom/webbrowserpersist/nsWebBrowserPersist.h
toolkit/components/browser/moz.build
toolkit/components/browser/nsCWebBrowser.idl
toolkit/components/browser/nsEmbedCID.h
toolkit/components/browser/nsWebBrowser.cpp
toolkit/components/browser/nsWebBrowser.h
widget/windows/nsDragService.cpp
--- a/dom/webbrowserpersist/moz.build
+++ b/dom/webbrowserpersist/moz.build
@@ -4,17 +4,16 @@
 # 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/.
 
 # moved from embedding/components/webbrowserpersist Jan 13, 2017
 with Files("**"):
     BUG_COMPONENT = ("Core", "DOM")
 
 XPIDL_SOURCES += [
-    'nsCWebBrowserPersist.idl',
     'nsIWebBrowserPersist.idl',
     'nsIWebBrowserPersistDocument.idl',
 ]
 
 XPIDL_MODULE = 'webbrowserpersist'
 
 IPDL_SOURCES += [
     'PWebBrowserPersistDocument.ipdl',
deleted file mode 100644
--- a/dom/webbrowserpersist/nsCWebBrowserPersist.idl
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: IDL; 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 "nsIWebBrowserPersist.idl"
-
-%{ C++
-// {7E677795-C582-4cd1-9E8D-8271B3474D2A}
-#define NS_WEBBROWSERPERSIST_CID \
-{ 0x7e677795, 0xc582, 0x4cd1, { 0x9e, 0x8d, 0x82, 0x71, 0xb3, 0x47, 0x4d, 0x2a } }
-#define NS_WEBBROWSERPERSIST_CONTRACTID \
-"@mozilla.org/embedding/browser/nsWebBrowserPersist;1"
-%}
--- a/dom/webbrowserpersist/nsIWebBrowserPersist.idl
+++ b/dom/webbrowserpersist/nsIWebBrowserPersist.idl
@@ -256,8 +256,21 @@ interface nsIWebBrowserPersist : nsICanc
 
   /**
    * Cancels the current operation. The caller is responsible for cleaning up
    * partially written files or directories. This has the same effect as calling
    * cancel with an argument of NS_BINDING_ABORTED.
    */
   void cancelSave();
 };
+
+/**
+ * We don't export nsWebBrowserPersist.h as a public header, so we need a place
+ * to put the CID/ContractID. All places uses the WebBrowserPersist include
+ * nsIWebBrowserPersist.h, so we define our contract IDs here for now.
+ */
+%{ C++
+// {7E677795-C582-4cd1-9E8D-8271B3474D2A}
+#define NS_WEBBROWSERPERSIST_CID \
+  { 0x7e677795, 0xc582, 0x4cd1, { 0x9e, 0x8d, 0x82, 0x71, 0xb3, 0x47, 0x4d, 0x2a } }
+#define NS_WEBBROWSERPERSIST_CONTRACTID \
+  "@mozilla.org/embedding/browser/nsWebBrowserPersist;1"
+%}
--- a/dom/webbrowserpersist/nsWebBrowserPersist.h
+++ b/dom/webbrowserpersist/nsWebBrowserPersist.h
@@ -16,25 +16,24 @@
 #include "nsIOutputStream.h"
 #include "nsIInputStream.h"
 #include "nsIChannel.h"
 #include "nsIDocumentEncoder.h"
 #include "nsITransport.h"
 #include "nsIProgressEventSink.h"
 #include "nsIFile.h"
 #include "nsIWebProgressListener2.h"
+#include "nsIWebBrowserPersist.h"
 #include "nsIWebBrowserPersistDocument.h"
 
 #include "mozilla/UniquePtr.h"
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"
 
-#include "nsCWebBrowserPersist.h"
-
 class nsIStorageStream;
 class nsIWebBrowserPersistDocument;
 
 class nsWebBrowserPersist final : public nsIInterfaceRequestor,
                                   public nsIWebBrowserPersist,
                                   public nsIStreamListener,
                                   public nsIProgressEventSink,
                                   public nsSupportsWeakReference
--- a/toolkit/components/browser/moz.build
+++ b/toolkit/components/browser/moz.build
@@ -5,17 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
     BUG_COMPONENT = ('Toolkit', 'General')
 
 DIRS += ['build']
 
 XPIDL_SOURCES += [
-    'nsCWebBrowser.idl',
     'nsIEmbeddingSiteWindow.idl',
     'nsIWebBrowser.idl',
     'nsIWebBrowserChrome.idl',
     'nsIWebBrowserChrome2.idl',
     'nsIWebBrowserChrome3.idl',
     'nsIWebBrowserChromeFocus.idl',
     'nsIWebBrowserFocus.idl',
     'nsIWebBrowserSetup.idl',
deleted file mode 100644
--- a/toolkit/components/browser/nsCWebBrowser.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: IDL; 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 "nsIWebBrowser.idl"
-#include "nsIBaseWindow.idl"
-#include "nsIScrollable.idl"
-#include "nsITextScroll.idl"
-
-/*
-nsCWebBrowser implements:
--------------------------
-nsIWebBrowser
-nsIDocShellTreeItem
-nsIWebNavigation
-nsIWebProgress
-nsIBaseWindow
-nsIScrollable
-nsITextScroll
-nsIInterfaceRequestor
-
-
-Outwardly communicates with:
-----------------------------
-nsIWebBrowserChrome
-nsIBaseWindow
-nsIInterfaceRequestor
-*/
-
-%{ C++
-#include "nsEmbedCID.h"
-%}
--- a/toolkit/components/browser/nsEmbedCID.h
+++ b/toolkit/components/browser/nsEmbedCID.h
@@ -38,20 +38,9 @@
  *
  * Embedders may override this ContractID with their own implementation if they
  * want more control over the way prompts, alerts, and confirmation dialogs are
  * presented to the user.
  */
 #define NS_PROMPTSERVICE_CONTRACTID \
  "@mozilla.org/embedcomp/prompt-service;1"
 
-/**
- * This contract ID should be implemented by password managers to be able to
- * override the standard implementation of nsIAuthPrompt2. It will be used as
- * a service.
- *
- * This contract implements the following interfaces:
- * nsIPromptFactory
- */
-#define NS_PWMGR_AUTHPROMPTFACTORY \
- "@mozilla.org/passwordmanager/authpromptfactory;1"
-
 #endif // NSEMBEDCID_H
--- a/toolkit/components/browser/nsWebBrowser.cpp
+++ b/toolkit/components/browser/nsWebBrowser.cpp
@@ -26,17 +26,16 @@
 #include "nsIWebProgress.h"
 #include "nsIWebProgressListener.h"
 #include "nsIWebBrowserFocus.h"
 #include "nsIPresShell.h"
 #include "nsIURIContentListener.h"
 #include "nsISHistoryListener.h"
 #include "nsIURI.h"
 #include "nsIWebBrowserPersist.h"
-#include "nsCWebBrowserPersist.h"
 #include "nsIServiceManager.h"
 #include "nsFocusManager.h"
 #include "Layers.h"
 #include "nsILoadContext.h"
 #include "nsDocShell.h"
 
 #include "mozilla/dom/Element.h"
 
--- a/toolkit/components/browser/nsWebBrowser.h
+++ b/toolkit/components/browser/nsWebBrowser.h
@@ -11,17 +11,16 @@
 #include "nsDocShellTreeOwner.h"
 
 // Core Includes
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 
 // Interfaces needed
-#include "nsCWebBrowser.h"
 #include "nsIBaseWindow.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIScrollable.h"
 #include "nsISHistory.h"
 #include "nsITextScroll.h"
--- a/widget/windows/nsDragService.cpp
+++ b/widget/windows/nsDragService.cpp
@@ -24,17 +24,16 @@
 #include "nsDataObjCollection.h"
 
 #include "nsArrayUtils.h"
 #include "nsString.h"
 #include "nsEscape.h"
 #include "nsIScreenManager.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIURL.h"
-#include "nsCWebBrowserPersist.h"
 #include "nsToolkit.h"
 #include "nsCRT.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsUnicharUtils.h"
 #include "nsRect.h"
 #include "nsMathUtils.h"
 #include "WinUtils.h"
 #include "KeyboardLayout.h"