Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 8657d0055dab (bug 1351426) for bustage (implicit conversion at BSPTree.h:64). r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-04-11 20:03:56 +02:00
parent ff0202d231
commit 9b51c27976
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/layers/composite/ContainerLayerComposite.cpp
View File

@ -165,8 +165,8 @@ struct PreparedLayer
{
PreparedLayer(LayerComposite *aLayer,
RenderTargetIntRect aClipRect,
Maybe<gfx::Polygon>&& aGeometry)
: mLayer(aLayer), mClipRect(aClipRect), mGeometry(Move(aGeometry)) {}
const Maybe<gfx::Polygon>& aGeometry)
: mLayer(aLayer), mClipRect(aClipRect), mGeometry(aGeometry) {}
LayerComposite* mLayer;
RenderTargetIntRect mClipRect;
@ -195,10 +195,10 @@ ContainerPrepare(ContainerT* aContainer,
? ContainerLayerComposite::SortMode::WITH_GEOMETRY
: ContainerLayerComposite::SortMode::WITHOUT_GEOMETRY;
nsTArray<LayerPolygon> polygons =
const nsTArray<LayerPolygon> polygons =
aContainer->SortChildrenBy3DZOrder(sortMode);
for (LayerPolygon& layer : polygons) {
for (const LayerPolygon& layer : polygons) {
LayerComposite* layerToRender =
static_cast<LayerComposite*>(layer.layer->ImplData());
@ -227,8 +227,7 @@ ContainerPrepare(ContainerT* aContainer,
CULLING_LOG("Preparing sublayer %p\n", layerToRender->GetLayer());
layerToRender->Prepare(clipRect);
aContainer->mPrepared->mLayers.AppendElement(PreparedLayer(layerToRender, clipRect,
Move(layer.geometry)));
aContainer->mPrepared->mLayers.AppendElement(PreparedLayer(layerToRender, clipRect, layer.geometry));
}
CULLING_LOG("Preparing container layer %p\n", aContainer->GetLayer());