author | Robert O'Callahan <robert@ocallahan.org> |
Mon, 17 Sep 2012 17:07:32 +1200 | |
changeset 107566 | bd01565fa8a168f24abb370007fc27077199726b |
parent 107565 | 9dec661d4ce568b228df50a01a590ef55697f399 |
child 107567 | d7a64a0020698c94b814037a525fc15ea59c5779 |
push id | 15113 |
push user | rocallahan@mozilla.com |
push date | Thu, 20 Sep 2012 04:14:13 +0000 |
treeherder | mozilla-inbound@84317c2f199c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | smaug |
bugs | 468568 |
milestone | 18.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
|
layout/printing/nsPagePrintTimer.cpp | file | annotate | diff | comparison | revisions | |
layout/printing/nsPagePrintTimer.h | file | annotate | diff | comparison | revisions |
--- a/layout/printing/nsPagePrintTimer.cpp +++ b/layout/printing/nsPagePrintTimer.cpp @@ -3,17 +3,17 @@ * 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 "nsPagePrintTimer.h" #include "nsIContentViewer.h" #include "nsIServiceManager.h" #include "nsPrintEngine.h" -NS_IMPL_ISUPPORTS1(nsPagePrintTimer, nsITimerCallback) +NS_IMPL_ISUPPORTS_INHERITED1(nsPagePrintTimer, nsRunnable, nsITimerCallback) nsPagePrintTimer::~nsPagePrintTimer() { // "Destroy" the document viewer; this normally doesn't actually // destroy it because of the IncrementDestroyRefCount call below // XXX This is messy; the document viewer should use a single approach // to keep itself alive during printing nsCOMPtr<nsIContentViewer> cv(do_QueryInterface(mDocViewerPrint));
--- a/layout/printing/nsPagePrintTimer.h +++ b/layout/printing/nsPagePrintTimer.h @@ -13,18 +13,18 @@ #include "mozilla/Attributes.h" #include "nsThreadUtils.h" class nsPrintEngine; //--------------------------------------------------- //-- Page Timer Class //--------------------------------------------------- -class nsPagePrintTimer MOZ_FINAL : public nsITimerCallback, - public nsRunnable +class nsPagePrintTimer MOZ_FINAL : public nsRunnable, + public nsITimerCallback { public: NS_DECL_ISUPPORTS nsPagePrintTimer(nsPrintEngine* aPrintEngine, nsIDocumentViewerPrint* aDocViewerPrint, uint32_t aDelay)