Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1409446 - Unify the clip stack in WebRenderAPI. r=jrmuizel

Browse Source 
By using a variant we can keep a single stack of both clips and
scrollframes, rather than two separate stacks. This is important because
we will want to know how the things are interleaved (e.g. if the last
thing that was pushed was a clip or a scrollframe).

MozReview-Commit-ID: DbhDj2tTq64

--HG--
extra : rebase_source : c591787f31e6ba864178e27197cf6dff42e39a8d
This commit is contained in:
Kartikaya Gupta 2017-10-24 15:45:58 -04:00
parent d3658ef3fb
commit 26c5991efb
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gfx/webrender_bindings/WebRenderAPI.cpp
View File

@ -725,7 +725,7 @@ DisplayListBuilder::PushClip(const wr::WrClipId& aClipId, bool aExtra)
wr_dp_push_clip(mWrState, aClipId.id);
WRDL_LOG("PushClip id=%" PRIu64 "\n", mWrState, aClipId.id);
if (!aExtra) {
mClipIdStack.push_back(aClipId);
mClipStack.push_back(wr::ScrollOrClipId(aClipId));
} else {
mExtraClipCount++;
}
@ -734,9 +734,10 @@ DisplayListBuilder::PushClip(const wr::WrClipId& aClipId, bool aExtra)
void
DisplayListBuilder::PopClip(bool aExtra)
{
WRDL_LOG("PopClip id=%" PRIu64 "\n", mWrState, mClipIdStack.back().id);
WRDL_LOG("PopClip\n", mWrState);
if (!aExtra) {
mClipIdStack.pop_back();
MOZ_ASSERT(mClipStack.back().is<wr::WrClipId>());
mClipStack.pop_back();
} else {
mExtraClipCount--;
}
@ -812,14 +813,15 @@ DisplayListBuilder::PushScrollLayer(const layers::FrameMetrics::ViewID& aScrollI
{
WRDL_LOG("PushScrollLayer id=%" PRIu64 "\n", mWrState, aScrollId);
wr_dp_push_scroll_layer(mWrState, aScrollId);
mScrollIdStack.push_back(aScrollId);
mClipStack.push_back(wr::ScrollOrClipId(aScrollId));
}
void
DisplayListBuilder::PopScrollLayer()
{
WRDL_LOG("PopScrollLayer id=%" PRIu64 "\n", mWrState, mScrollIdStack.back());
mScrollIdStack.pop_back();
MOZ_ASSERT(mClipStack.back().is<layers::FrameMetrics::ViewID>());
WRDL_LOG("PopScrollLayer id=%" PRIu64 "\n", mWrState, mClipStack.back().as<layers::FrameMetrics::ViewID>());
mClipStack.pop_back();
wr_dp_pop_scroll_layer(mWrState);
}
@ -831,14 +833,15 @@ DisplayListBuilder::PushClipAndScrollInfo(const layers::FrameMetrics::ViewID& aS
aClipId ? Stringify(aClipId->id).c_str() : "none");
wr_dp_push_clip_and_scroll_info(mWrState, aScrollId,
aClipId ? &(aClipId->id) : nullptr);
mScrollIdStack.push_back(aScrollId);
mClipStack.push_back(wr::ScrollOrClipId(aScrollId));
}
void
DisplayListBuilder::PopClipAndScrollInfo()
{
MOZ_ASSERT(mClipStack.back().is<layers::FrameMetrics::ViewID>());
WRDL_LOG("PopClipAndScroll\n", mWrState);
mScrollIdStack.pop_back();
mClipStack.pop_back();
wr_dp_pop_clip_and_scroll_info(mWrState);
}
@ -1131,19 +1134,23 @@ DisplayListBuilder::PushBoxShadow(const wr::LayoutRect& aRect,
Maybe<wr::WrClipId>
DisplayListBuilder::TopmostClipId()
{
if (mClipIdStack.empty()) {
return Nothing();
for (auto it = mClipStack.crbegin(); it != mClipStack.crend(); it++) {
if (it->is<wr::WrClipId>()) {
return Some(it->as<wr::WrClipId>());
}
}
return Some(mClipIdStack.back());
return Nothing();
}
layers::FrameMetrics::ViewID
DisplayListBuilder::TopmostScrollId()
{
if (mScrollIdStack.empty()) {
return layers::FrameMetrics::NULL_SCROLL_ID;
for (auto it = mClipStack.crbegin(); it != mClipStack.crend(); it++) {
if (it->is<layers::FrameMetrics::ViewID>()) {
return it->as<layers::FrameMetrics::ViewID>();
}
}
return mScrollIdStack.back();
return layers::FrameMetrics::NULL_SCROLL_ID;
}
} // namespace wr

8
gfx/webrender_bindings/WebRenderAPI.h
View File

@ -413,11 +413,9 @@ protected:
wr::WrState* mWrState;
// Track the stack of clip ids and scroll layer ids that have been pushed
// (by PushClip and PushScrollLayer, respectively) and are still active.
// This is helpful for knowing e.g. what the ancestor scroll id of a particular
// scroll id is, and doing other "queries" of current state.
std::vector<wr::WrClipId> mClipIdStack;
std::vector<layers::FrameMetrics::ViewID> mScrollIdStack;
// (by PushClip and PushScrollLayer/PushClipAndScrollInfo, respectively) and
// haven't yet been popped.
std::vector<wr::ScrollOrClipId> mClipStack;
// Track each scroll id that we encountered. We use this structure to
// ensure that we don't define a particular scroll layer multiple times,