Bug 1430689 - Make ReturnToGalleyPresentation non-virtual. r=bobowen
authorJonathan Watt <jwatt@jwatt.org>
Fri, 05 Jan 2018 12:47:20 +0000
changeset 399463 80d2455164acf704527014a975ef2d49d15b91f3
parent 399462 fd6dca879e6a5f2a3cf1b9be4e9e992176193dd0
child 399464 001402b879ceb6eb765166b05e99414ffcf55dd5
push id98967
push userjwatt@jwatt.org
push dateTue, 16 Jan 2018 21:11:14 +0000
treeherdermozilla-inbound@76ce0d94b9b7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbobowen
bugs1430689
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 1430689 - Make ReturnToGalleyPresentation non-virtual. r=bobowen MozReview-Commit-ID: J3dZuZfDXFd
layout/base/nsDocumentViewer.cpp
layout/base/nsIDocumentViewerPrint.h
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -301,16 +301,18 @@ private:
 #ifdef NS_PRINTING
   // Called when the DocViewer is notified that the state
   // of Printing or PP has changed
   void SetIsPrintingInDocShellTree(nsIDocShellTreeItem* aParentNode,
                                    bool                 aIsPrintingOrPP,
                                    bool                 aStartAtTop);
 #endif // NS_PRINTING
 
+  void ReturnToGalleyPresentation();
+
   // Whether we should attach to the top level widget. This is true if we
   // are sharing/recycling a single base widget and not creating multiple
   // child widgets.
   bool ShouldAttachToTopLevel();
 
 protected:
   // These return the current shell/prescontext etc.
   nsIPresShell* GetPresShell();
--- a/layout/base/nsIDocumentViewerPrint.h
+++ b/layout/base/nsIDocumentViewerPrint.h
@@ -39,18 +39,16 @@ public:
   // The style set returned by CreateStyleSet is in the middle of an
   // update batch so that the caller can add sheets to it if needed.
   // Callers should call EndUpdate() on it when ready to use.
   virtual mozilla::StyleSetHandle CreateStyleSet(nsIDocument* aDocument) = 0;
 
   virtual void IncrementDestroyRefCount() = 0;
   virtual void DecrementDestroyRefCount() = 0;
 
-  virtual void ReturnToGalleyPresentation() = 0;
-
   virtual void OnDonePrinting() = 0;
 
   /**
    * Returns true is InitializeForPrintPreview() has been called.
    */
   virtual bool IsInitializedForPrintPreview() = 0;
 
   /**
@@ -73,17 +71,16 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumen
 #define NS_DECL_NSIDOCUMENTVIEWERPRINT \
   void SetIsPrinting(bool aIsPrinting) override; \
   bool GetIsPrinting() override; \
   void SetIsPrintPreview(bool aIsPrintPreview) override; \
   bool GetIsPrintPreview() override; \
   mozilla::StyleSetHandle CreateStyleSet(nsIDocument* aDocument) override; \
   void IncrementDestroyRefCount() override; \
   void DecrementDestroyRefCount() override; \
-  void ReturnToGalleyPresentation() override; \
   void OnDonePrinting() override; \
   bool IsInitializedForPrintPreview() override; \
   void InitializeForPrintPreview() override; \
   void SetPrintPreviewPresentation(nsViewManager* aViewManager, \
                                    nsPresContext* aPresContext, \
                                    nsIPresShell* aPresShell) override;
 
 #endif /* nsIDocumentViewerPrint_h___ */