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

Bug 896138 patch 7: Remove unused aFrameManager parameters to some functions. r=heycam

Browse Source
This commit is contained in:
L. David Baron
2013-07-20 12:14:25 -07:00
parent 82f7e7134b
commit 03e7bf4a60
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
layout/base/RestyleManager.cpp
View File

@@ -70,7 +70,6 @@ static bool gInApplyRenderingChangeToTree = false;
static void static void
DoApplyRenderingChangeToTree(nsIFrame* aFrame, DoApplyRenderingChangeToTree(nsIFrame* aFrame,
nsFrameManager* aFrameManager,
nsChangeHint aChange); nsChangeHint aChange);
/** /**
@@ -83,7 +82,6 @@ DoApplyRenderingChangeToTree(nsIFrame* aFrame,
*/ */
static void static void
SyncViewsAndInvalidateDescendants(nsIFrame* aFrame, SyncViewsAndInvalidateDescendants(nsIFrame* aFrame,
nsFrameManager* aFrameManager,
nsChangeHint aChange) nsChangeHint aChange)
{ {
NS_PRECONDITION(gInApplyRenderingChangeToTree, NS_PRECONDITION(gInApplyRenderingChangeToTree,
@@ -112,13 +110,11 @@ SyncViewsAndInvalidateDescendants(nsIFrame* aFrame,
// do the out-of-flow frame and its continuations // do the out-of-flow frame and its continuations
nsIFrame* outOfFlowFrame = nsIFrame* outOfFlowFrame =
nsPlaceholderFrame::GetRealFrameForPlaceholder(child); nsPlaceholderFrame::GetRealFrameForPlaceholder(child);
DoApplyRenderingChangeToTree(outOfFlowFrame, aFrameManager, DoApplyRenderingChangeToTree(outOfFlowFrame, aChange);
aChange);
} else if (lists.CurrentID() == nsIFrame::kPopupList) { } else if (lists.CurrentID() == nsIFrame::kPopupList) {
DoApplyRenderingChangeToTree(child, aFrameManager, DoApplyRenderingChangeToTree(child, aChange);
aChange);
} else { // regular frame } else { // regular frame
SyncViewsAndInvalidateDescendants(child, aFrameManager, aChange); SyncViewsAndInvalidateDescendants(child, aChange);
} }
} }
} }
@@ -168,7 +164,6 @@ GetFrameForChildrenOnlyTransformHint(nsIFrame *aFrame)
static void static void
DoApplyRenderingChangeToTree(nsIFrame* aFrame, DoApplyRenderingChangeToTree(nsIFrame* aFrame,
nsFrameManager* aFrameManager,
nsChangeHint aChange) nsChangeHint aChange)
{ {
NS_PRECONDITION(gInApplyRenderingChangeToTree, NS_PRECONDITION(gInApplyRenderingChangeToTree,
@@ -180,7 +175,7 @@ DoApplyRenderingChangeToTree(nsIFrame* aFrame,
// there can't be any out-of-flows or popups that need to be transformed; // there can't be any out-of-flows or popups that need to be transformed;
// all out-of-flow descendants of the transformed element must also be // all out-of-flow descendants of the transformed element must also be
// descendants of the transformed frame. // descendants of the transformed frame.
SyncViewsAndInvalidateDescendants(aFrame, aFrameManager, SyncViewsAndInvalidateDescendants(aFrame,
nsChangeHint(aChange & (nsChangeHint_RepaintFrame | nsChangeHint(aChange & (nsChangeHint_RepaintFrame |
nsChangeHint_SyncFrameView | nsChangeHint_SyncFrameView |
nsChangeHint_UpdateOpacityLayer))); nsChangeHint_UpdateOpacityLayer)));
@@ -297,7 +292,7 @@ ApplyRenderingChangeToTree(nsPresContext* aPresContext,
#ifdef DEBUG #ifdef DEBUG
gInApplyRenderingChangeToTree = true; gInApplyRenderingChangeToTree = true;
#endif #endif
DoApplyRenderingChangeToTree(aFrame, shell->FrameManager(), aChange); DoApplyRenderingChangeToTree(aFrame, aChange);
#ifdef DEBUG #ifdef DEBUG
gInApplyRenderingChangeToTree = false; gInApplyRenderingChangeToTree = false;
#endif #endif

6
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -6253,7 +6253,7 @@ nsCSSFrameConstructor::MaybeConstructLazily(Operation aOperation,
} }
} }
PostRestyleEventForLazyConstruction(); RestyleManager()->PostRestyleEventForLazyConstruction();
return true; return true;
} }
@@ -8526,8 +8526,8 @@ nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent,
// ContentRemoved triggered reconstruction, then we don't need to do this // ContentRemoved triggered reconstruction, then we don't need to do this
// because the frames will already have been built. // because the frames will already have been built.
if (aAsyncInsert) { if (aAsyncInsert) {
PostRestyleEvent(aContent->AsElement(), nsRestyleHint(0), RestyleManager()->PostRestyleEvent(
nsChangeHint_ReconstructFrame); aContent->AsElement(), nsRestyleHint(0), nsChangeHint_ReconstructFrame);
} else { } else {
rv = ContentInserted(container, aContent, mTempFrameTreeState, false); rv = ContentInserted(container, aContent, mTempFrameTreeState, false);
} }