Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 19:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1201327 - Rename mDestRect to mImageLayerDestRect. r=mattwoodrow

Browse Source 
--HG--
extra : commitid : 1cQZUlaicax
extra : rebase_source : f0877a904738c9f75a96b2bbe64728ff567f044e
This commit is contained in:
Markus Stange 2015-10-20 15:27:29 +02:00
parent ef4655be32
commit 0beffda503
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsDisplayList.cpp
View File

@ -2434,7 +2434,7 @@ nsDisplayBackgroundImage::CanOptimizeToImageLayer(LayerManager* aManager,
// layer pixel boundaries. This should be OK for now.
int32_t appUnitsPerDevPixel = presContext->AppUnitsPerDevPixel();
mDestRect =
mImageLayerDestRect =
LayoutDeviceRect::FromAppUnits(state.mDestArea, appUnitsPerDevPixel);
// Ok, we can turn this into a layer if needed.
@ -2527,7 +2527,7 @@ nsDisplayBackgroundImage::GetLayerState(nsDisplayListBuilder* aBuilder,
mImage->GetHeight(&imageHeight);
NS_ASSERTION(imageWidth != 0 && imageHeight != 0, "Invalid image size!");
const LayerRect destLayerRect = mDestRect * aParameters.Scale();
const LayerRect destLayerRect = mImageLayerDestRect * aParameters.Scale();
// Calculate the scaling factor for the frame.
const gfxSize scale = gfxSize(destLayerRect.width / imageWidth,
@ -2589,10 +2589,10 @@ nsDisplayBackgroundImage::ConfigureLayer(ImageLayer* aLayer,
// aParameters.Offset() is always zero.
MOZ_ASSERT(aParameters.Offset() == LayerIntPoint(0,0));
const LayoutDevicePoint p = mDestRect.TopLeft();
const LayoutDevicePoint p = mImageLayerDestRect.TopLeft();
Matrix transform = Matrix::Translation(p.x, p.y);
transform.PreScale(mDestRect.width / imageWidth,
mDestRect.height / imageHeight);
transform.PreScale(mImageLayerDestRect.width / imageWidth,
mImageLayerDestRect.height / imageHeight);
aLayer->SetBaseTransform(gfx::Matrix4x4::From2D(transform));
}

2
layout/base/nsDisplayList.h
View File

@ -2634,7 +2634,7 @@ protected:
const nsStyleBackground* mBackgroundStyle;
nsCOMPtr<imgIContainer> mImage;
RefPtr<ImageContainer> mImageContainer;
LayoutDeviceRect mDestRect;
LayoutDeviceRect mImageLayerDestRect;
/* Bounds of this display item */
nsRect mBounds;
uint32_t mLayer;