Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1261698. Make ReparentFrameViewTo return void because it always returns NS_OK. r=mats

Browse Source
This commit is contained in:
Timothy Nikkel 2016-04-06 01:26:42 -05:00
parent d94e6fb6a4
commit 42e0b26d3f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsContainerFrame.cpp
View File

@ -372,7 +372,7 @@ nsContainerFrame::PeekOffsetCharacter(bool aForward, int32_t* aOffset,
/////////////////////////////////////////////////////////////////////////////
// Helper member functions
static nsresult
static void
ReparentFrameViewTo(nsIFrame* aFrame,
nsViewManager* aViewManager,
nsView* aNewParentView,
@ -382,7 +382,7 @@ ReparentFrameViewTo(nsIFrame* aFrame,
#ifdef MOZ_XUL
if (aFrame->GetType() == nsGkAtoms::menuPopupFrame) {
// This view must be parented by the root view, don't reparent it.
return NS_OK;
return;
}
#endif
nsView* view = aFrame->GetView();
@ -407,8 +407,6 @@ ReparentFrameViewTo(nsIFrame* aFrame,
}
}
}
return NS_OK;
}
void
@ -540,8 +538,8 @@ nsContainerFrame::ReparentFrameView(nsIFrame* aChildFrame,
// anything
if (oldParentView != newParentView) {
// They're not so we need to reparent any child views
return ReparentFrameViewTo(aChildFrame, oldParentView->GetViewManager(), newParentView,
oldParentView);
ReparentFrameViewTo(aChildFrame, oldParentView->GetViewManager(), newParentView,
oldParentView);
}
return NS_OK;