Merge m-c to inbound.

This commit is contained in:
Ryan VanderMeulen 2013-01-15 19:44:40 -05:00
commit 80f054fa70

View File

@ -3627,10 +3627,10 @@ nsGlobalWindow::GetInnerWidth(int32_t* aInnerWidth)
{
FORWARD_TO_OUTER(GetInnerWidth, (aInnerWidth), NS_ERROR_NOT_INITIALIZED);
NS_ENSURE_STATE(mDocShell);
EnsureSizeUpToDate();
NS_ENSURE_STATE(mDocShell);
nsRefPtr<nsPresContext> presContext;
mDocShell->GetPresContext(getter_AddRefs(presContext));
@ -3695,10 +3695,10 @@ nsGlobalWindow::GetInnerHeight(int32_t* aInnerHeight)
{
FORWARD_TO_OUTER(GetInnerHeight, (aInnerHeight), NS_ERROR_NOT_INITIALIZED);
NS_ENSURE_STATE(mDocShell);
EnsureSizeUpToDate();
NS_ENSURE_STATE(mDocShell);
nsRefPtr<nsPresContext> presContext;
mDocShell->GetPresContext(getter_AddRefs(presContext));