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 473390 part 13. Remove the unused aScrolledChildStyle argument of BuildScrollFrame. r+sr=roc

Browse Source
This commit is contained in:
Boris Zbarsky 2009-01-19 13:31:33 -05:00
parent 2793dc5658
commit 18399c778f
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/base/nsCSSFrameConstructor.cpp
View File

@ -3439,7 +3439,7 @@ nsCSSFrameConstructor::ConstructTableRowGroupFrame(nsFrameConstructorState& aSta
if (styleDisplay->IsScrollableOverflow()) {
// Create an area container for the frame
BuildScrollFrame(aState, aContent, aStyleContext, aNewFrame, parentFrame,
scrollFrame, aStyleContext);
scrollFrame);
}
else {
@ -4771,9 +4771,8 @@ nsCSSFrameConstructor::InitializeSelectFrame(nsFrameConstructorState& aState,
}
}
nsStyleContext* scrolledPseudoStyle;
BuildScrollFrame(aState, aContent, aStyleContext, scrolledFrame,
geometricParent, scrollFrame, scrolledPseudoStyle);
geometricParent, scrollFrame);
if (aState.mFrameState && aState.mFrameManager) {
// Restore frame state for the scroll frame
@ -5742,7 +5741,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState,
if (mayBeScrollable && display->IsScrollableOverflow()) {
// set the top to be the newly created scrollframe
BuildScrollFrame(aState, aContent, aStyleContext, newFrame,
aParentFrame, topFrame, aStyleContext);
aParentFrame, topFrame);
// No need to change aParentFrame here, since its only use when
// !frameHasBeenInitialized is for the AddChild call (and in that case we
@ -5958,8 +5957,7 @@ nsCSSFrameConstructor::BuildScrollFrame(nsFrameConstructorState& aState,
nsStyleContext* aContentStyle,
nsIFrame* aScrolledFrame,
nsIFrame* aParentFrame,
nsIFrame*& aNewFrame,
nsStyleContext*& aScrolledContentStyle)
nsIFrame*& aNewFrame)
{
nsRefPtr<nsStyleContext> scrolledContentStyle =
BeginBuildingScrollFrame(aState, aContent, aContentStyle, aParentFrame,
@ -5971,8 +5969,6 @@ nsCSSFrameConstructor::BuildScrollFrame(nsFrameConstructorState& aState,
FinishBuildingScrollFrame(aNewFrame, aScrolledFrame);
aScrolledContentStyle = scrolledContentStyle;
// now set the primary frame to the ScrollFrame
aState.mFrameManager->SetPrimaryFrameFor( aContent, aNewFrame );
return NS_OK;

3
layout/base/nsCSSFrameConstructor.h
View File

@ -938,8 +938,7 @@ private:
nsStyleContext* aContentStyle,
nsIFrame* aScrolledFrame,
nsIFrame* aParentFrame,
nsIFrame*& aNewFrame,
nsStyleContext*& aScrolledChildStyle);
nsIFrame*& aNewFrame);
// Builds the initial ScrollFrame
already_AddRefed<nsStyleContext>