Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1655521 - Remove unnecessary code from nsDocumentViewer::ExitPrintPreview, r=jwatt

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D85343
This commit is contained in:
Kashav Madan 2020-08-04 16:41:52 +00:00
parent 8b9dd163cc
commit 0944a1d57c
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
layout/base/nsDocumentViewer.cpp
View File

@ -3361,28 +3361,6 @@ nsDocumentViewer::Cancel() {
return mPrintJob->Cancel();
}
# ifdef NS_PRINT_PREVIEW
// Reset ESM focus for all descendent doc shells.
static void ResetFocusState(nsIDocShell* aDocShell) {
nsIFocusManager* fm = nsFocusManager::GetFocusManager();
if (!fm) {
return;
}
nsTArray<RefPtr<nsIDocShell>> docShells;
aDocShell->GetAllDocShellsInSubtree(nsIDocShellTreeItem::typeContent,
nsIDocShell::ENUMERATE_FORWARDS,
docShells);
for (const auto& currentContainer : docShells) {
nsCOMPtr<nsPIDOMWindowOuter> win = do_GetInterface(currentContainer);
if (win) {
fm->ClearFocus(win);
}
}
}
# endif // NS_PRINT_PREVIEW
NS_IMETHODIMP
nsDocumentViewer::ExitPrintPreview() {
NS_ENSURE_TRUE(mPrintJob, NS_ERROR_FAILURE);
@ -3407,17 +3385,12 @@ nsDocumentViewer::ExitPrintPreview() {
mPrintJob->Destroy();
mPrintJob = nullptr;
// Nowadays we use a static clone document for printing, and print preview is
// in a separate tab that gets closed after print preview finishes. Probably
// nothing below this line is necessary anymore.
SetIsPrintPreview(false);
nsCOMPtr<nsIDocShell> docShell(mContainer);
ResetFocusState(docShell);
SetOverrideDPPX(mOverrideDPPX);
Show();
// Since the print preview implementation discards the window that was used
// to show the print preview, we skip certain cleanup that we would otherwise
// want to do. Specifically, we do not call `SetIsPrintPreview(false)` to
// unblock navigation, we do not call `SetOverrideDPPX` to reset the
// devicePixelRatio, and we do not call `Show` to make such changes take
// affect.
# endif // NS_PRINT_PREVIEW
return NS_OK;