diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-03-15 09:11:31 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-15 09:11:31 +0100 |
| commit | 82b361dc4463b13ebda30090e239db487f5aa308 (patch) | |
| tree | fdc6fd06e695188735d636da57b02b6c7e0c1c5f /layout/printing | |
| parent | 4bb98e2b61ce75d7f5d19398b658441a7ceed04b (diff) | |
| parent | 71429dc7ecc496c5924c770746e8c28449ecb7a2 (diff) | |
| download | UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar.gz UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar.lz UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar.xz UXP-82b361dc4463b13ebda30090e239db487f5aa308.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'layout/printing')
| -rw-r--r-- | layout/printing/nsPagePrintTimer.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/layout/printing/nsPagePrintTimer.cpp b/layout/printing/nsPagePrintTimer.cpp index b56569a9a..164b0469a 100644 --- a/layout/printing/nsPagePrintTimer.cpp +++ b/layout/printing/nsPagePrintTimer.cpp @@ -14,14 +14,8 @@ NS_IMPL_ISUPPORTS_INHERITED(nsPagePrintTimer, mozilla::Runnable, nsITimerCallbac 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)); - if (cv) { - cv->Destroy(); - } + // This matches the IncrementDestroyRefCount call in the constructor. + mDocViewerPrint->DecrementDestroyRefCount(); } nsresult |