зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1552785
. Stop using GetHowToEnableFrameUI in nsPrintJob::EnablePOsForPrinting. r=bobowen
kFrameEnableNone is synonymous with having a non-frameset document. This makes what is going on here explicit. It also gets rid of the kRangeSelection based override and makes that explicit too. Differential Revision: https://phabricator.services.mozilla.com/D33684 --HG-- extra : rebase_source : 7cb1c4be168816f13f01189f672c43b80ab9bbe0
This commit is contained in:
Родитель
266860bac6
Коммит
659bdf822a
|
@ -2911,19 +2911,13 @@ nsresult nsPrintJob::EnablePOsForPrinting() {
|
|||
PR_PL(("PrintRange: %s \n", gPrintRangeStr[printRangeType]));
|
||||
PR_PL(("----\n"));
|
||||
|
||||
// ***** This is the ultimate override *****
|
||||
// if we are printing the selection (either an IFrame or selection range)
|
||||
// then set the mPrintFrameType as if it were the selected frame
|
||||
if (printRangeType == nsIPrintSettings::kRangeSelection) {
|
||||
printHowEnable = nsIPrintSettings::kFrameEnableNone;
|
||||
}
|
||||
|
||||
// This tells us that the "Frame" UI has turned off,
|
||||
// so therefore there are no FrameSets/Frames/IFrames to be printed
|
||||
//
|
||||
// This means there are not FrameSets,
|
||||
// but the document could contain an IFrame
|
||||
if (printHowEnable == nsIPrintSettings::kFrameEnableNone) {
|
||||
if (!printData->mIsParentAFrameSet ||
|
||||
printRangeType == nsIPrintSettings::kRangeSelection) {
|
||||
// Print all the pages or a sub range of pages
|
||||
if (printRangeType == nsIPrintSettings::kRangeAllPages ||
|
||||
printRangeType == nsIPrintSettings::kRangeSpecifiedPageRange) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче