Bug 1387143 part 20. Remove nsISelectionPrivate. r=mats

accessible/html/HTMLTableAccessible.cpp

@@ -19,7 +19,6 @@
 
 #include "mozilla/dom/HTMLTableElement.h"
 #include "nsIDOMRange.h"
-#include "nsISelectionPrivate.h"
 #include "nsIHTMLCollection.h"
 #include "nsIDocument.h"
 #include "nsIMutableArray.h"

accessible/html/HTMLTableAccessible.h

@@ -182,7 +182,7 @@ protected:
    *
    * @param aIndex   [in] index of row or column to be selected
    * @param aTarget  [in] indicates what should be selected, either row or column
-   *                  (see nsISelectionPrivate)
+   *                  (see nsFrameSelection)
    */
   nsresult AddRowOrColumnToSelection(int32_t aIndex, TableSelection aTarget);
 

dom/base/Selection.cpp

@@ -763,7 +763,6 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(Selection)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Selection)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISelection)
-  NS_INTERFACE_MAP_ENTRY(nsISelectionPrivate)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISelection)
 NS_INTERFACE_MAP_END

dom/base/Selection.h

@@ -14,11 +14,13 @@
 #include "mozilla/TextRange.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WeakPtr.h"
+#include "nsDirection.h"
+#include "nsIPresShell.h"  // For ScrollAxis
 #include "nsISelection.h"
 #include "nsISelectionController.h"
 #include "nsISelectionListener.h"
-#include "nsISelectionPrivate.h"
 #include "nsRange.h"
+#include "nsTArrayForwardDeclare.h"
 #include "nsThreadUtils.h"
 #include "nsWrapperCache.h"
 
@@ -64,7 +66,6 @@ namespace dom {
 // is never deleted before its Selections.
 class Selection final : public nsISelection,
                         public nsWrapperCache,
-                        public nsISelectionPrivate,
                         public nsSupportsWeakReference,
                         public SupportsWeakPtr<Selection>
 {
@@ -80,7 +81,6 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Selection, nsISelection)
   NS_DECL_NSISELECTION
-  NS_DECL_NSISELECTIONPRIVATE
 
   // match this up with EndbatchChanges. will stop ui updates while multiple
   // selection methods are called

dom/base/SelectionChangeListener.h

@@ -8,7 +8,6 @@
 #define mozilla_SelectionChangeListener_h_
 
 #include "nsISelectionListener.h"
-#include "nsISelectionPrivate.h"
 #include "mozilla/Attributes.h"
 
 namespace mozilla {

dom/base/moz.build

@@ -29,7 +29,6 @@ XPIDL_SOURCES += [
     'nsISelectionController.idl',
     'nsISelectionDisplay.idl',
     'nsISelectionListener.idl',
-    'nsISelectionPrivate.idl',
     'nsISlowScriptDebug.idl',
 ]
 

dom/base/nsDocumentEncoder.cpp

@@ -28,7 +28,6 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptSecurityManager.h"
 #include "mozilla/dom/Selection.h"
-#include "nsISelectionPrivate.h"
 #include "nsITransferable.h" // for kUnicodeMime
 #include "nsContentUtils.h"
 #include "nsElementTable.h"

dom/base/nsISelectionPrivate.idl

@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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 "nsISelection.idl"
-
-interface nsRange;
-interface nsIDOMNode;
-interface nsISelectionListener;
-interface nsIContent;
-interface nsINode;
-interface nsIDOMRange;
-
-%{C++
-class nsIFrame;
-struct nsPoint;
-struct ScrollAxis;
-#include "nsDirection.h"
-#include "nsIPresShell.h" // TODO: Remove this include
-#include "nsTArrayForwardDeclare.h"
-#include "mozilla/EventForwards.h"
-%}
-
-[ptr] native nsIFrame(nsIFrame);
-[ptr] native RangeArray(nsTArray<nsRange*>);
-[ref] native nsPointRef(nsPoint);
-native nsDirection(nsDirection);
-native ScrollAxis(nsIPresShell::ScrollAxis);
-
-[uuid(0c9f4f74-ee7e-4fe9-be6b-0ba856368178)]
-interface nsISelectionPrivate : nsISupports
-{
-};
-

dom/html/nsHTMLDocument.cpp

@@ -60,7 +60,6 @@
 #include "nsIHttpChannel.h"
 #include "nsIFile.h"
 #include "nsFrameSelection.h"
-#include "nsISelectionPrivate.h" //for toStringwithformat code
 
 #include "nsContentUtils.h"
 #include "nsJSUtils.h"

dom/html/nsTextEditorState.cpp

@@ -27,7 +27,6 @@
 #include "nsIEditorObserver.h"
 #include "nsIWidget.h"
 #include "nsIDocumentEncoder.h"
-#include "nsISelectionPrivate.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "mozilla/dom/Selection.h"

dom/webidl/Selection.webidl

@@ -76,7 +76,7 @@ partial interface Selection {
               DOMString granularity);
 };
 
-// Additional chrome-only methods from nsISelectionPrivate
+// Additional chrome-only methods.
 interface nsISelectionListener;
 partial interface Selection {
   /**

editor/composer/nsEditingSession.cpp

@@ -37,7 +37,6 @@
 #include "nsIRefreshURI.h"              // for nsIRefreshURI
 #include "nsIRequest.h"                 // for nsIRequest
 #include "nsISelection.h"               // for nsISelection
-#include "nsISelectionPrivate.h"        // for nsISelectionPrivate
 #include "nsITimer.h"                   // for nsITimer, etc
 #include "nsITransactionManager.h"      // for nsITransactionManager
 #include "nsIWeakReference.h"           // for nsISupportsWeakReference, etc

layout/base/nsCaret.cpp

@@ -19,7 +19,6 @@
 #include "nsIFrame.h"
 #include "nsIScrollableFrame.h"
 #include "nsIDOMNode.h"
-#include "nsISelectionPrivate.h"
 #include "nsIContent.h"
 #include "nsIPresShell.h"
 #include "nsLayoutUtils.h"

layout/generic/nsDirection.h

@@ -8,7 +8,7 @@
 #define nsDirection_h___
 
 // This file makes the nsDirection enum present both in nsIFrame.h and
-// nsISelectionPrivate.h.
+// Selection.h.
 
 enum nsDirection {
   eDirNext    = 0,

layout/generic/nsFrame.cpp

@@ -50,7 +50,6 @@
 #include "mozilla/RestyleManager.h"
 #include "nsInlineFrame.h"
 #include "nsIDOMNode.h"
-#include "nsISelectionPrivate.h"
 #include "nsFrameSelection.h"
 #include "nsGkAtoms.h"
 #include "nsCSSAnonBoxes.h"

layout/printing/nsPrintJob.cpp

@@ -79,7 +79,6 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsIDOMDocument.h"
 #include "nsIDocumentObserver.h"
 #include "nsISelectionListener.h"
-#include "nsISelectionPrivate.h"
 #include "nsContentCID.h"
 #include "nsLayoutCID.h"
 #include "nsContentUtils.h"

widget/nsBaseDragService.cpp

@@ -19,7 +19,6 @@
 #include "nsIPresShell.h"
 #include "nsViewManager.h"
 #include "nsIDOMNode.h"
-#include "nsISelectionPrivate.h"
 #include "nsPresContext.h"
 #include "nsIImageLoadingContent.h"
 #include "imgIContainer.h"