wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 831472 - Add another null check to nsGlobalWindow::GetInnerScreenRect(). r=smaug

Browse Source
This commit is contained in:
Gary Kwong 2013-01-16 13:44:26 -08:00
parent 190d56fcd0
commit 5121706d6d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dom/base/nsGlobalWindow.cpp
View File

@ -3874,8 +3874,9 @@ nsGlobalWindow::GetScreenX(int32_t* aScreenX)
nsRect
nsGlobalWindow::GetInnerScreenRect()
{
if (!mDocShell)
if (!mDocShell) {
return nsRect();
}
nsGlobalWindow* rootWindow =
static_cast<nsGlobalWindow*>(GetPrivateRoot());
@ -3883,12 +3884,18 @@ nsGlobalWindow::GetInnerScreenRect()
rootWindow->FlushPendingNotifications(Flush_Layout);
}
if (!mDocShell) {
return nsRect();
}
nsCOMPtr<nsIPresShell> presShell = mDocShell->GetPresShell();
if (!presShell)
if (!presShell) {
return nsRect();
}
nsIFrame* rootFrame = presShell->GetRootFrame();
if (!rootFrame)
if (!rootFrame) {
return nsRect();
}
return rootFrame->GetScreenRectInAppUnits();
}