Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1554985 - Invert condition to reduce indentation. r=jrmuizel

Browse Source 
No functional changes here.

Differential Revision: https://phabricator.services.mozilla.com/D36385

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kartikaya Gupta 2019-06-30 01:36:54 +00:00
parent a9bd762a6a
commit e1bbcf0b32
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
layout/painting/nsDisplayList.cpp
View File

@ -7023,49 +7023,50 @@ bool nsDisplayRenderRoot::CreateWebRenderCommands(
mozilla::wr::IpcResourceUpdateQueue& aResources,
const StackingContextHelper& aSc, RenderRootStateManager* aManager,
nsDisplayListBuilder* aDisplayListBuilder) {
if (aDisplayListBuilder->GetNeedsDisplayListBuild(mRenderRoot) ||
!mBuiltWRCommands) {
if (aBuilder.GetRenderRoot() == mRenderRoot) {
nsDisplayWrapList::CreateWebRenderCommands(aBuilder, aResources, aSc,
aManager, aDisplayListBuilder);
} else {
RefPtr<WebRenderRenderRootData> userData =
aManager->CommandBuilder()
.CreateOrRecycleWebRenderUserData<WebRenderRenderRootData>(
this, aBuilder.GetRenderRoot());
mBoundary = Some(userData->EnsureHasBoundary(mRenderRoot));
WebRenderCommandBuilder::ScrollDataBoundaryWrapper wrapper(
aManager->CommandBuilder(), *mBoundary);
aBuilder.SetSendSubBuilderDisplayList(mRenderRoot);
wr::DisplayListBuilder& builder = aBuilder.SubBuilder(mRenderRoot);
wr::IpcResourceUpdateQueue& resources = aResources.SubQueue(mRenderRoot);
wr::StackingContextParams params;
params.clip =
wr::WrStackingContextClip::ClipChain(builder.CurrentClipChainId());
LayoutDeviceRect rrRect =
aDisplayListBuilder->GetRenderRootRect(mRenderRoot);
LayoutDevicePoint scOrigin = aSc.GetOrigin();
// Subtract the render root rect from this, as it already acts as the
// origin for our whole display list in WebRender (via SetDocumentView).
// However, we can't simply ignore the value of aSc.GetOrigin(), even
// though they will often be the same. This is because there might be
// multiple cousin nsDisplayRenderRoots in a tree of nsDisplayItems, and
// the RenderRootRect will be the union of their areas.
scOrigin.x -= rrRect.x;
scOrigin.y -= rrRect.y;
StackingContextHelper sc(
aManager->CommandBuilder().GetRootStackingContextHelper(mRenderRoot),
nullptr, nullptr, nullptr, builder, params,
LayoutDeviceRect(scOrigin, LayoutDeviceSize()));
nsDisplayWrapList::CreateWebRenderCommands(builder, resources, sc,
aManager, aDisplayListBuilder);
}
mBuiltWRCommands = true;
if (!aDisplayListBuilder->GetNeedsDisplayListBuild(mRenderRoot) &&
mBuiltWRCommands) {
return true;
}
if (aBuilder.GetRenderRoot() == mRenderRoot) {
nsDisplayWrapList::CreateWebRenderCommands(aBuilder, aResources, aSc,
aManager, aDisplayListBuilder);
} else {
RefPtr<WebRenderRenderRootData> userData =
aManager->CommandBuilder()
.CreateOrRecycleWebRenderUserData<WebRenderRenderRootData>(
this, aBuilder.GetRenderRoot());
mBoundary = Some(userData->EnsureHasBoundary(mRenderRoot));
WebRenderCommandBuilder::ScrollDataBoundaryWrapper wrapper(
aManager->CommandBuilder(), *mBoundary);
aBuilder.SetSendSubBuilderDisplayList(mRenderRoot);
wr::DisplayListBuilder& builder = aBuilder.SubBuilder(mRenderRoot);
wr::IpcResourceUpdateQueue& resources = aResources.SubQueue(mRenderRoot);
wr::StackingContextParams params;
params.clip =
wr::WrStackingContextClip::ClipChain(builder.CurrentClipChainId());
LayoutDeviceRect rrRect =
aDisplayListBuilder->GetRenderRootRect(mRenderRoot);
LayoutDevicePoint scOrigin = aSc.GetOrigin();
// Subtract the render root rect from this, as it already acts as the
// origin for our whole display list in WebRender (via SetDocumentView).
// However, we can't simply ignore the value of aSc.GetOrigin(), even
// though they will often be the same. This is because there might be
// multiple cousin nsDisplayRenderRoots in a tree of nsDisplayItems, and
// the RenderRootRect will be the union of their areas.
scOrigin.x -= rrRect.x;
scOrigin.y -= rrRect.y;
StackingContextHelper sc(
aManager->CommandBuilder().GetRootStackingContextHelper(mRenderRoot),
nullptr, nullptr, nullptr, builder, params,
LayoutDeviceRect(scOrigin, LayoutDeviceSize()));
nsDisplayWrapList::CreateWebRenderCommands(builder, resources, sc,
aManager, aDisplayListBuilder);
}
mBuiltWRCommands = true;
return true;
}