Bug 1425641, part 4 - Remove nsIWebBrowserPrint.GetCurrentChildDOMWindow. r=bobowen
☠☠ backed out by 00c5de096a91 ☠ ☠
authorJonathan Watt <jwatt@jwatt.org>
Wed, 06 Dec 2017 16:02:34 +0000
changeset 449176 05966b36d7d6fb92a66bc6c6bd661c33cc3b4619
parent 449175 8a2305426cf2c02a6023e8367519e96c39336940
child 449177 00c5de096a91b623e00a410004d9fbd2dbd0aa65
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbobowen
bugs1425641
milestone59.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 1425641, part 4 - Remove nsIWebBrowserPrint.GetCurrentChildDOMWindow. r=bobowen MozReview-Commit-ID: 56tyJYySlco
layout/base/nsDocumentViewer.cpp
toolkit/components/browser/nsIWebBrowserPrint.idl
toolkit/components/printingui/ipc/PrintDataUtils.cpp
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -4188,25 +4188,16 @@ nsDocumentViewer::GetCurrentPrintSetting
   NS_ENSURE_ARG_POINTER(aCurrentPrintSettings);
 
   *aCurrentPrintSettings = nullptr;
   NS_ENSURE_TRUE(mPrintJob, NS_ERROR_FAILURE);
 
   return mPrintJob->GetCurrentPrintSettings(aCurrentPrintSettings);
 }
 
-
-NS_IMETHODIMP
-nsDocumentViewer::GetCurrentChildDOMWindow(mozIDOMWindowProxy** aCurrentChildDOMWindow)
-{
-  NS_ENSURE_ARG_POINTER(aCurrentChildDOMWindow);
-  *aCurrentChildDOMWindow = nullptr;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 nsDocumentViewer::Cancel()
 {
   NS_ENSURE_TRUE(mPrintJob, NS_ERROR_FAILURE);
   return mPrintJob->Cancelled();
 }
 
 NS_IMETHODIMP
--- a/toolkit/components/browser/nsIWebBrowserPrint.idl
+++ b/toolkit/components/browser/nsIWebBrowserPrint.idl
@@ -41,28 +41,16 @@ interface nsIWebBrowserPrint : nsISuppor
    * that was passed into either "print" or "print preview"
    *
    * This enables any consumers of the interface to have access
    * to the "current" PrintSetting at later points in the execution
    */
   readonly attribute nsIPrintSettings currentPrintSettings;
 
   /**
-   * Returns a pointer to the current child DOMWindow
-   * that is being print previewed. (FrameSet Frames)
-   *
-   * Returns null if parent document is not a frameset or the entire FrameSet 
-   * document is being print previewed
-   *
-   * This enables any consumers of the interface to have access
-   * to the "current" child DOMWindow at later points in the execution
-   */
-  readonly attribute mozIDOMWindowProxy currentChildDOMWindow;
-
-  /**
    * Returns whether it is in Print mode
    */
   readonly attribute boolean doingPrint;
 
   /**
    * Returns whether it is in Print Preview mode
    */
   readonly attribute boolean doingPrintPreview;
--- a/toolkit/components/printingui/ipc/PrintDataUtils.cpp
+++ b/toolkit/components/printingui/ipc/PrintDataUtils.cpp
@@ -38,22 +38,16 @@ MockWebBrowserPrint::GetGlobalPrintSetti
 
 NS_IMETHODIMP
 MockWebBrowserPrint::GetCurrentPrintSettings(nsIPrintSettings **aCurrentPrintSettings)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
-MockWebBrowserPrint::GetCurrentChildDOMWindow(mozIDOMWindowProxy **aCurrentPrintSettings)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
 MockWebBrowserPrint::GetDoingPrint(bool *aDoingPrint)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 MockWebBrowserPrint::GetDoingPrintPreview(bool *aDoingPrintPreview)
 {