mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 05:11:16 +00:00
Bug 1622360 - Downgrade pageRootScs from RenderRootArray. r=jrmuizel
Depends on D70603 Differential Revision: https://phabricator.services.mozilla.com/D70604 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
68b8339258
commit
094d451696
@ -1533,28 +1533,22 @@ void WebRenderCommandBuilder::BuildWebRenderCommands(
|
||||
bool isTopLevelContent =
|
||||
presContext->Document()->IsTopLevelContentDocument();
|
||||
|
||||
wr::RenderRootArray<Maybe<StackingContextHelper>> pageRootScs;
|
||||
for (auto renderRoot : wr::kRenderRoots) {
|
||||
wr::StackingContextParams params;
|
||||
// Just making this explicit - we assume that we do not want any
|
||||
// filters traversing a RenderRoot boundary
|
||||
if (renderRoot == wr::RenderRoot::Default) {
|
||||
params.mFilters = std::move(aFilters.filters);
|
||||
params.mFilterDatas = std::move(aFilters.filter_datas);
|
||||
}
|
||||
params.cache_tiles = isTopLevelContent;
|
||||
params.clip =
|
||||
wr::WrStackingContextClip::ClipChain(aBuilder.CurrentClipChainId());
|
||||
pageRootScs[renderRoot].emplace(rootScs[renderRoot], nullptr, nullptr,
|
||||
nullptr, aBuilder, params);
|
||||
}
|
||||
wr::StackingContextParams params;
|
||||
params.mFilters = std::move(aFilters.filters);
|
||||
params.mFilterDatas = std::move(aFilters.filter_datas);
|
||||
params.cache_tiles = isTopLevelContent;
|
||||
params.clip =
|
||||
wr::WrStackingContextClip::ClipChain(aBuilder.CurrentClipChainId());
|
||||
|
||||
StackingContextHelper pageRootSc(rootScs[wr::RenderRoot::Default], nullptr,
|
||||
nullptr, nullptr, aBuilder, params);
|
||||
if (ShouldDumpDisplayList(aDisplayListBuilder)) {
|
||||
mBuilderDumpIndex =
|
||||
aBuilder.Dump(mDumpIndent + 1, Some(mBuilderDumpIndex), Nothing());
|
||||
}
|
||||
CreateWebRenderCommandsFromDisplayList(
|
||||
aDisplayList, nullptr, aDisplayListBuilder,
|
||||
*pageRootScs[wr::RenderRoot::Default], aBuilder, aResourceUpdates);
|
||||
CreateWebRenderCommandsFromDisplayList(aDisplayList, nullptr,
|
||||
aDisplayListBuilder, pageRootSc,
|
||||
aBuilder, aResourceUpdates);
|
||||
}
|
||||
|
||||
// Make a "root" layer data that has everything else as descendants
|
||||
|
Loading…
Reference in New Issue
Block a user