Bug 1022612. Part 29: Expose GetAnimatedGeometryRootForFrame. r=mattwoodrow

--HG--
extra : rebase_source : bca7885147f0328d9700770052500e856d131bd9
This commit is contained in:
Robert O'Callahan 2014-06-23 16:21:42 +12:00
parent 8d1480e197
commit cf26fc0f33
2 changed files with 12 additions and 4 deletions

View File

@ -1481,7 +1481,7 @@ nsLayoutUtils::GetScrollableFrameFor(const nsIFrame *aScrolledFrame)
{
nsIFrame *frame = aScrolledFrame->GetParent();
nsIScrollableFrame *sf = do_QueryFrame(frame);
return sf && sf->GetScrolledFrame() == aScrolledFrame ? sf : nullptr;
return (sf && sf->GetScrolledFrame() == aScrolledFrame) ? sf : nullptr;
}
/* static */ void
@ -1603,9 +1603,9 @@ IsScrollbarThumbLayerized(nsIFrame* aThumbFrame)
return reinterpret_cast<intptr_t>(aThumbFrame->Properties().Get(ScrollbarThumbLayerized()));
}
static nsIFrame*
GetAnimatedGeometryRootForFrame(nsIFrame* aFrame,
const nsIFrame* aStopAtAncestor)
nsIFrame*
nsLayoutUtils::GetAnimatedGeometryRootForFrame(nsIFrame* aFrame,
const nsIFrame* aStopAtAncestor)
{
nsIFrame* f = aFrame;
nsIFrame* stickyFrame = nullptr;

View File

@ -499,6 +499,14 @@ public:
static nsIFrame* GetAnimatedGeometryRootFor(nsDisplayItem* aItem,
nsDisplayListBuilder* aBuilder);
/**
* Finds the nearest ancestor frame to aFrame that is considered to have (or
* will have) "animated geometry". This could be aFrame. Returns
* aStopAtAncestor if no closer ancestor is found.
*/
static nsIFrame* GetAnimatedGeometryRootForFrame(nsIFrame* aFrame,
const nsIFrame* aStopAtAncestor);
/**
* GetScrollableFrameFor returns the scrollable frame for a scrolled frame
*/