Skip to content

Commit

Permalink
Bug 1120211 - Don't force the innerwindow size to the outerwindow siz…
Browse files Browse the repository at this point in the history
…e if the viewport is overridden. r=dbaron

In Fennec, if the root window gets resized, background tabs get a delayed
resize event queued up. When those background tabs get painted next, the delayed
resize is flushed. However, the code that flushes the delayed resize does not
check to see if the viewport is already overridden. This is in contrast to all
the other code paths that propagate outerwindow size change to the innerwindow,
and is incorrect because it effectively clobbers any meta-viewport tag with the
outerwindow dimensions. This patch corrects this code path to also check if the
viewport is overridden.
  • Loading branch information
staktrace committed Jan 11, 2015
1 parent 1ba6fc9 commit 7370fc4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion view/nsViewManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ nsViewManager::FlushDelayedResize(bool aDoReflow)
if (aDoReflow) {
DoSetWindowDimensions(mDelayedResize.width, mDelayedResize.height);
mDelayedResize.SizeTo(NSCOORD_NONE, NSCOORD_NONE);
} else if (mPresShell) {
} else if (mPresShell && !mPresShell->GetIsViewportOverridden()) {
nsPresContext* presContext = mPresShell->GetPresContext();
if (presContext) {
presContext->SetVisibleArea(nsRect(nsPoint(0, 0), mDelayedResize));
Expand Down

0 comments on commit 7370fc4

Please sign in to comment.