corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 637864 - Give nsIViewManager::GetRootView a sane signature; r=bz

Browse Source
This commit is contained in:
Ms2ger
2011-03-29 22:24:54 -04:00
parent 75436b2651
commit cc1d294433
19 changed files with 59 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
layout/base/nsPresShell.cpp
View File

@@ -4844,8 +4844,8 @@ PresShell::FlushPendingNotifications(mozFlushType aType)
}
#ifdef DEBUG
if (!mIsDestroying) {
nsIView* rootView;
if (NS_SUCCEEDED(mViewManager->GetRootView(rootView)) && rootView) {
nsIView* rootView = mViewManager->GetRootView();
if (rootView) {
nsRect bounds = rootView->GetBounds();
NS_ASSERTION(bounds.Size() == mPresContext->GetVisibleArea().Size(),
"root view / pres context visible size mismatch");
@@ -5906,8 +5906,8 @@ LayerManager* PresShell::GetLayerManager()
{
NS_ASSERTION(mViewManager, "Should have view manager");
nsIView* rootView;
if (NS_SUCCEEDED(mViewManager->GetRootView(rootView)) && rootView) {
nsIView* rootView = mViewManager->GetRootView();
if (rootView) {
if (nsIWidget* widget = rootView->GetWidget()) {
return widget->GetLayerManager();
}
@@ -6270,8 +6270,7 @@ PresShell::RetargetEventToParent(nsGUIEvent* aEvent,
}
// Fake the event as though it'ss from the parent pres shell's root view.
nsIView *parentRootView;
parentPresShell->GetViewManager()->GetRootView(parentRootView);
nsIView *parentRootView = parentPresShell->GetViewManager()->GetRootView();
return parentViewObserver->HandleEvent(parentRootView, aEvent, PR_TRUE, aEventStatus);
}
@@ -6362,10 +6361,8 @@ PresShell::HandleEvent(nsIView *aView,
if (!viewObserver)
return NS_ERROR_FAILURE;
nsIView *view;
presShell->GetViewManager()->GetRootView(view);
nsresult rv = viewObserver->HandleEvent(view, aEvent, PR_TRUE, aEventStatus);
return rv;
nsIView* view = presShell->GetViewManager()->GetRootView();
return viewObserver->HandleEvent(view, aEvent, PR_TRUE, aEventStatus);
}
}
}
@@ -6394,8 +6391,7 @@ PresShell::HandleEvent(nsIView *aView,
// from the root views widget. This is necessary to prevent us from
// dispatching the SysColorChanged notification for each child window
// which may be redundant.
nsIView *view;
vm->GetRootView(view);
nsIView* view = vm->GetRootView();
if (view == aView) {
*aEventStatus = nsEventStatus_eConsumeDoDefault;
mPresContext->SysColorChanged();
@@ -6586,8 +6582,7 @@ PresShell::HandleEvent(nsIView *aView,
nsContentUtils::ContentIsCrossDocDescendantOf(activeShell->GetDocument(),
shell->GetDocument())) {
shell = static_cast<PresShell*>(activeShell);
nsIView* activeShellRootView;
shell->GetViewManager()->GetRootView(activeShellRootView);
nsIView* activeShellRootView = shell->GetViewManager()->GetRootView();
frame = static_cast<nsIFrame*>(activeShellRootView->GetClientData());
}
}
@@ -6596,8 +6591,7 @@ PresShell::HandleEvent(nsIView *aView,
// Handle the event in the correct shell.
// Prevent deletion until we're done with event handling (bug 336582).
nsCOMPtr<nsIPresShell> kungFuDeathGrip(shell);
nsIView* subshellRootView;
shell->GetViewManager()->GetRootView(subshellRootView);
nsIView* subshellRootView = shell->GetViewManager()->GetRootView();
// We pass the subshell's root view as the view to start from. This is
// the only correct alternative; if the event was captured then it
// must have been captured by us or some ancestor shell and we
@@ -6663,8 +6657,7 @@ PresShell::HandleEvent(nsIView *aView,
nsIPresShell* shell = targetDoc->GetShell();
nsCOMPtr<nsIViewObserver> vo = do_QueryInterface(shell);
if (vo) {
nsIView* root = nsnull;
shell->GetViewManager()->GetRootView(root);
nsIView* root = shell->GetViewManager()->GetRootView();
rv = static_cast<PresShell*>(shell)->HandleRetargetedEvent(aEvent,
root,
aEventStatus,
@@ -7850,8 +7843,7 @@ PresShell::DoVerifyReflow()
if (GetVerifyReflowEnable()) {
// First synchronously render what we have so far so that we can
// see it.
nsIView* rootView;
mViewManager->GetRootView(rootView);
nsIView* rootView = mViewManager->GetRootView();
mViewManager->UpdateView(rootView, NS_VMREFRESH_IMMEDIATE);
FlushPendingNotifications(Flush_Layout);
@@ -8495,8 +8487,7 @@ PresShell::VerifyIncrementalReflow()
NS_ENSURE_SUCCESS(rv, PR_FALSE);
// Get our scrolling preference
nsIView* rootView;
mViewManager->GetRootView(rootView);
nsIView* rootView = mViewManager->GetRootView();
NS_ENSURE_TRUE(rootView->HasWidget(), PR_FALSE);
nsIWidget* parentWidget = rootView->GetWidget();