зеркало из https://github.com/mozilla/pjs.git
This partially backs out the previous patch. We no longer need to set/get anything in the nsIPrintOptions.
What this does is: 1) Reflows the first time constrained and remembers mOverflowArea.XMost() of the HTML frame and then later uses that for the calculation of the ratio. 2) Renames some variables 3) This also changes the the maximum STF ratio from 0.5 to 0.3 to match the dropdown in PP Bug 168961 r=dcone sr=kin
This commit is contained in:
Родитель
1dbc0efb80
Коммит
264f778382
|
@ -95,10 +95,6 @@ interface nsIPrintOptions : nsISupports
|
|||
/* Purposely made this an "in" arg */
|
||||
[noscript] void GetDefaultFont(in nsNativeFontRef aFont);
|
||||
|
||||
/* caches bool value so we know how to reflow
|
||||
This will get picked by the nsSequencePageFrame */
|
||||
[noscript] attribute boolean doUncontrainedReflow;
|
||||
|
||||
/**
|
||||
* Native data constants
|
||||
*/
|
||||
|
|
|
@ -113,8 +113,7 @@ nsFont* nsPrintOptions::sDefaultFont = nsnull;
|
|||
* See documentation in nsPrintOptionsImpl.h
|
||||
* @update 6/21/00 dwc
|
||||
*/
|
||||
nsPrintOptions::nsPrintOptions() :
|
||||
mDoUncontrainedReflow(PR_FALSE)
|
||||
nsPrintOptions::nsPrintOptions()
|
||||
{
|
||||
NS_INIT_ISUPPORTS();
|
||||
|
||||
|
@ -260,21 +259,6 @@ nsPrintOptions::GetDefaultFont(nsFont &aFont)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
/* [noscript] attribute boolean doUncontrainedReflow; */
|
||||
NS_IMETHODIMP
|
||||
nsPrintOptions::GetDoUncontrainedReflow(PRBool *aDoUncontrainedReflow)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aDoUncontrainedReflow);
|
||||
*aDoUncontrainedReflow = mDoUncontrainedReflow;
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHODIMP
|
||||
nsPrintOptions::SetDoUncontrainedReflow(PRBool aDoUncontrainedReflow)
|
||||
{
|
||||
mDoUncontrainedReflow = aDoUncontrainedReflow;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/** ---------------------------------------------------
|
||||
* See documentation in nsPrintOptionsImpl.h
|
||||
* @update 6/21/00 dwc
|
||||
|
|
|
@ -69,7 +69,6 @@ protected:
|
|||
nsCOMPtr<nsIPrintSettings> mGlobalPrintSettings;
|
||||
|
||||
nsCString mPrefName;
|
||||
PRBool mDoUncontrainedReflow;
|
||||
|
||||
static nsFont* sDefaultFont;
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче