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

Merge autoland to central, a=merge

Browse Source 
MozReview-Commit-ID: 9BfFPDy1vO7
This commit is contained in:
Wes Kocher
2017-08-14 17:28:19 -07:00
parent 438e0148a1 3760acd1bc
commit b6f8dba116
237 changed files with 2396 additions and 1770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/wr/AsyncImagePipelineManager.cpp
View File

@@ -266,7 +266,7 @@ AsyncImagePipelineManager::ApplyAsyncImages()
continue;
}
wr::LayoutSize contentSize { pipeline->mScBounds.width, pipeline->mScBounds.height };
wr::LayoutSize contentSize { pipeline->mScBounds.Width(), pipeline->mScBounds.Height() };
wr::DisplayListBuilder builder(pipelineId, contentSize);
if (!keys.IsEmpty()) {
@@ -309,7 +309,7 @@ AsyncImagePipelineManager::ApplyAsyncImages()
wr::BuiltDisplayList dl;
wr::LayoutSize builderContentSize;
builder.Finalize(builderContentSize, dl);
mApi->SetRootDisplayList(gfx::Color(0.f, 0.f, 0.f, 0.f), epoch, LayerSize(pipeline->mScBounds.width, pipeline->mScBounds.height),
mApi->SetRootDisplayList(gfx::Color(0.f, 0.f, 0.f, 0.f), epoch, LayerSize(pipeline->mScBounds.Width(), pipeline->mScBounds.Height()),
pipelineId, builderContentSize,
dl.dl_desc, dl.dl.inner.data, dl.dl.inner.length);
}