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

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

Browse Source
This commit is contained in:
Robert O'Callahan
2014-06-23 16:21:42 +12:00
parent 5dbd1652e8
commit 5b53bea7da
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsLayoutUtils.cpp
View File

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

8
layout/base/nsLayoutUtils.h
View File

@@ -499,6 +499,14 @@ public:
static nsIFrame* GetAnimatedGeometryRootFor(nsDisplayItem* aItem, static nsIFrame* GetAnimatedGeometryRootFor(nsDisplayItem* aItem,
nsDisplayListBuilder* aBuilder); 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 * GetScrollableFrameFor returns the scrollable frame for a scrolled frame
*/ */