mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1072150 - Don't examine the subject principal in CheckSameOrigin. r=bz (60cbce0bd4) - Bug 633154. When alerts/prompts/confirms are suppressed, just return silently instead of throwing. r=sicking (a9b5bffb50) - Bug 1199295 - Pass right loadingPrincipal to uriloader/prefetch - dom changes (r=smaug) (c83e28c82f) - Bug 1206559, forward PuppetWidget::SetFocus request to the parent process, r=smaug (545b4befd2) - Bug 1171234 - Include triggering node in load info when doing prefetching (r=ckerschb) (28626724ea) - Bug 1192948 - Use channel->ascynOpen2 in uriloader/prefetch (r=smaug) (24cde65def) - Bug 1199295 - Pass right loadingPrincipal to uriloader/prefetch (r=mayhemer) (0a70254f49) - Bug 1111581 - Fix prefetch for e10s. r=mayhemer (1743b37e85) - adapted Bug 1172396 - Check for GMP resources from chrome process instead of content (71d438785f) - Bug 1184276 - Add some logging and don't bail if we can't find an nsPluginTag in RecvGetBlocklistState to try and get more diagnostic info r=billm (963ec63ad3) - Bug 1194897 - Copy parent window chromeFlags when instantiating a new TabParent in the parent process. r=smaug (296cafaacc) - Bug 1181467 - Fix mime type checking while copying image. r=Enn (2c77c687e5) - Bug 1139860 - Fix xpcshell content process timeout crashes (r=jimm) (e594a31bff) - Bug 1207490 - Part 1: Remove use of expression closure from browser/base/. r=dao (ef5ba24cbe) - Bug 1059014 (part 1) - Remove support for max line box width. r=dbaron. (eaf2e94721)
This commit is contained in:
@@ -790,8 +790,6 @@ PresShell::PresShell()
|
||||
|
||||
mScrollPositionClampingScrollPortSizeSet = false;
|
||||
|
||||
mMaxLineBoxWidth = 0;
|
||||
|
||||
static bool addedSynthMouseMove = false;
|
||||
if (!addedSynthMouseMove) {
|
||||
Preferences::AddBoolVarCache(&sSynthMouseMove,
|
||||
@@ -10927,19 +10925,6 @@ nsIPresShell::FontSizeInflationEnabled()
|
||||
return mFontSizeInflationEnabled;
|
||||
}
|
||||
|
||||
void
|
||||
nsIPresShell::SetMaxLineBoxWidth(nscoord aMaxLineBoxWidth)
|
||||
{
|
||||
NS_ASSERTION(aMaxLineBoxWidth >= 0, "attempting to set max line box width to a negative value");
|
||||
|
||||
if (mMaxLineBoxWidth != aMaxLineBoxWidth) {
|
||||
mMaxLineBoxWidth = aMaxLineBoxWidth;
|
||||
mReflowOnZoomPending = true;
|
||||
FrameNeedsReflow(GetRootFrame(), nsIPresShell::eResize,
|
||||
NS_FRAME_HAS_DIRTY_CHILDREN);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
PresShell::PausePainting()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user