Bug 978001. Null check presshell in nsViewManager::ProcessPendingUpdatesForView. r=mats

This commit is contained in:
Timothy Nikkel 2014-03-02 05:14:27 -06:00
parent f355ed7ab9
commit 8c0088f49e

View File

@ -411,22 +411,24 @@ void nsViewManager::ProcessPendingUpdatesForView(nsView* aView,
}
NS_ASSERTION(aView->HasWidget(), "FlushDelayedResize removed our widget!");
if (presShell) {
#ifdef MOZ_DUMP_PAINTING
if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
printf_stderr("---- PAINT START ----PresShell(%p), nsView(%p), nsIWidget(%p)\n", presShell, aView, widget);
}
if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
printf_stderr("---- PAINT START ----PresShell(%p), nsView(%p), nsIWidget(%p)\n", presShell, aView, widget);
}
#endif
nsAutoScriptBlocker scriptBlocker;
SetPainting(true);
presShell->Paint(aView, nsRegion(), nsIPresShell::PAINT_LAYERS);
nsAutoScriptBlocker scriptBlocker;
SetPainting(true);
presShell->Paint(aView, nsRegion(), nsIPresShell::PAINT_LAYERS);
#ifdef MOZ_DUMP_PAINTING
if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
printf_stderr("---- PAINT END ----\n");
}
if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
printf_stderr("---- PAINT END ----\n");
}
#endif
aView->SetForcedRepaint(false);
SetPainting(false);
aView->SetForcedRepaint(false);
SetPainting(false);
}
viewManager->FlushDirtyRegionToWidget(aView);
} else {
viewManager->FlushDirtyRegionToWidget(aView);