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

Bug 948221 - Part 7: Convert SurfaceFromElement to Moz2D. r=roc,Bas,bjacob

Browse Source
This commit is contained in:
Matt Woodrow
2013-12-12 10:05:27 +13:00
parent 7fee4c853d
commit 65c2d839be
9 changed files with 152 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/nsCSSRendering.cpp
View File

@@ -4324,7 +4324,7 @@ nsImageRenderer::PrepareImage()
if (!mPaintServerFrame) {
mImageElementSurface =
nsLayoutUtils::SurfaceFromElement(property->GetReferencedElement());
if (!mImageElementSurface.mSurface)
if (!mImageElementSurface.mSourceSurface)
return false;
}
mIsReady = true;
@@ -4403,7 +4403,7 @@ nsImageRenderer::ComputeIntrinsicSize()
ToAppUnits(appUnitsPerDevPixel));
}
} else {
NS_ASSERTION(mImageElementSurface.mSurface, "Surface should be ready.");
NS_ASSERTION(mImageElementSurface.mSourceSurface, "Surface should be ready.");
gfxIntSize surfaceSize = mImageElementSurface.mSize;
result.SetSize(
nsSize(nsPresContext::CSSPixelsToAppUnits(surfaceSize.width),
@@ -4597,9 +4597,9 @@ nsImageRenderer::Draw(nsPresContext* aPresContext,
mFlags & FLAG_SYNC_DECODE_IMAGES ?
nsSVGIntegrationUtils::FLAG_SYNC_DECODE_IMAGES : 0);
} else {
NS_ASSERTION(mImageElementSurface.mSurface, "Surface should be ready.");
NS_ASSERTION(mImageElementSurface.mSourceSurface, "Surface should be ready.");
nsRefPtr<gfxDrawable> surfaceDrawable =
new gfxSurfaceDrawable(mImageElementSurface.mSurface,
new gfxSurfaceDrawable(mImageElementSurface.mSourceSurface,
mImageElementSurface.mSize);
nsLayoutUtils::DrawPixelSnapped(
&aRenderingContext, surfaceDrawable, graphicsFilter,