mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
f1d1e16669
- Bug 1188569: Drop unneeded MOZ_WARN_UNUSED_RESULT from from LookupBestMatch in SurfaceCache.cpp. r=seth (5e74e0028c) - Bug 1192356 (Part 1) - Take advantage of mozilla::Tie() in SurfaceCache.cpp. r=dholbert (e4908c725d) - Bug 1192356 (Part 2) - Take advantage of mozilla::Tie() in RasterImage.cpp. r=tn (1204189b73) - Bug 1185800 - Add DecoderFlags and SurfaceFlags enum classes and use them instead of imgIContainer flags in all decoder-related code. r=tn (3abdab11f6) - Bug 1196066 (Part 3) - Rewrite nsICODecoder to use StreamingLexer. r=tn (e2ba590c9d) - Bug 1196066 (Part 4) - Enable the ICOMultiChunk test, which now passes. r=tn (9e02611959) - Bug 1124084 - Flip on downscale-during-decode everywhere. r=tn (bd9deff966) - Bug 1160801 - Treat invalid GIF disposal methods as DisposalMethod::NOT_SPECIFIED. r=jrmuizel (e26feaf8fb) - Bug 1201796 (Part 1) - Treat ICOs with wrong widths and heights as corrupt. r=tn (322ba20808) - Bug 1201796 (Part 2) - Add GetFrameAtSize() to support downscale-during-decode for GetFrame() use cases. r=tn (92f5d3a0a7) - Bug 1194906 - Replace 'NS_ENSURE_TRUE(BadImage(..))' warnings with more useful messages. r=tn (cc3b368673) - Bug 1201796 (Part 3) - Enable downscale-during-decode for imgITools::EncodeScaledImage(). r=tn (e2cdb5b520) - Bug 1194472 - Correctly fetch compositor backend in WebGLContext. r=jgilbert (0092052dfc) - Bug 1161913 - Part 1 - Add invalidation state for CaptureStream to Canvas and Contexts. r=mt (0377d6bbe7) - Bug 1168075 - Fix CanvasCaptureMediaStream build fail for bluetooth2. r=pehrsons (53c67c0056) - Bug 1176363 - Part 1: Make a raw copy of each Canvas::CaptureStream frame. r=mattwoodrow (a5df5793d6) - Bug 1194575 - Rename RecoverFromLossOfFrames() to RecoverFromInvalidFrames() to better reflect its role. r=tn (baa6455e79) - Bug 1146663 (Part 1) - Remove HQ scaling, which is now dead code. r=tn (efaddadea0) - Bug 1146663 (Part 2) - Remove the concept of lifetimes from the SurfaceCache. r=dholbert (ab9862d7ee) - Bug 1146663 (Part 3) - Make it impossible to deoptimize imgFrames. r=tn (19e2f1b370) - Bug 1201763 - Add downscale-during-decode support for the ICON decoder. r=tn (33a2b95e5c) - Bug 1194058 (Part 1) - Add Deinterlacer to allow Downscaler to work with interlaced images. r=tn (f7c57b7a8e) - Bug 1194058 (Part 2) - Add downscale-during-decode support for the GIF decoder. r=tn (85622f9d55) - Bug 1201796 (Part 4) - Add downscale-during-decode support for the ICO decoder. r=tn (d09d18b0d9) - Bug 1146663 (Part 4) - Make all RasterImages support downscale-during-decode. r=tn (264642a895) - Bug 1146663 (Part 5) - Require that all image decoders support downscale-during-decode. r=tn (79ad99885d) - Bug 1206836 - When downscaling ICOs, downscale the AND mask as well. r=tn a=KWierso (08ec3d092b) - missing bit of Bug 1138293 - Use malloc/free/realloc/calloc (eb8e5e1b9c) - missing bit of Bug 1146663 (Part 3) - Make it impossible to deoptimize imgFrames. (233befe48f) - Bug 1208935 - Move Deinterlacer to a standalone file. r=seth (b50322abc286)
358 lines
11 KiB
C++
358 lines
11 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include <algorithm>
|
|
|
|
#include "gfx2DGlue.h"
|
|
#include "gfxDrawable.h"
|
|
#include "gfxPlatform.h"
|
|
#include "gfxUtils.h"
|
|
#include "ImageRegion.h"
|
|
#include "SVGImageContext.h"
|
|
|
|
#include "OrientedImage.h"
|
|
|
|
using std::swap;
|
|
|
|
namespace mozilla {
|
|
|
|
using namespace gfx;
|
|
using layers::LayerManager;
|
|
using layers::ImageContainer;
|
|
|
|
namespace image {
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED0(OrientedImage, ImageWrapper)
|
|
|
|
NS_IMETHODIMP
|
|
OrientedImage::GetWidth(int32_t* aWidth)
|
|
{
|
|
if (mOrientation.SwapsWidthAndHeight()) {
|
|
return InnerImage()->GetHeight(aWidth);
|
|
} else {
|
|
return InnerImage()->GetWidth(aWidth);
|
|
}
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
OrientedImage::GetHeight(int32_t* aHeight)
|
|
{
|
|
if (mOrientation.SwapsWidthAndHeight()) {
|
|
return InnerImage()->GetWidth(aHeight);
|
|
} else {
|
|
return InnerImage()->GetHeight(aHeight);
|
|
}
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
OrientedImage::GetIntrinsicSize(nsSize* aSize)
|
|
{
|
|
nsresult rv = InnerImage()->GetIntrinsicSize(aSize);
|
|
|
|
if (mOrientation.SwapsWidthAndHeight()) {
|
|
swap(aSize->width, aSize->height);
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
OrientedImage::GetIntrinsicRatio(nsSize* aRatio)
|
|
{
|
|
nsresult rv = InnerImage()->GetIntrinsicRatio(aRatio);
|
|
|
|
if (mOrientation.SwapsWidthAndHeight()) {
|
|
swap(aRatio->width, aRatio->height);
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<SourceSurface>)
|
|
OrientedImage::GetFrame(uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
{
|
|
nsresult rv;
|
|
|
|
if (mOrientation.IsIdentity()) {
|
|
return InnerImage()->GetFrame(aWhichFrame, aFlags);
|
|
}
|
|
|
|
// Get the underlying dimensions.
|
|
gfxIntSize size;
|
|
rv = InnerImage()->GetWidth(&size.width);
|
|
NS_ENSURE_SUCCESS(rv, nullptr);
|
|
rv = InnerImage()->GetHeight(&size.height);
|
|
NS_ENSURE_SUCCESS(rv, nullptr);
|
|
|
|
// Determine an appropriate format for the surface.
|
|
gfx::SurfaceFormat surfaceFormat;
|
|
if (InnerImage()->IsOpaque()) {
|
|
surfaceFormat = gfx::SurfaceFormat::B8G8R8X8;
|
|
} else {
|
|
surfaceFormat = gfx::SurfaceFormat::B8G8R8A8;
|
|
}
|
|
|
|
// Create a surface to draw into.
|
|
RefPtr<DrawTarget> target =
|
|
gfxPlatform::GetPlatform()->
|
|
CreateOffscreenContentDrawTarget(size, surfaceFormat);
|
|
if (!target) {
|
|
NS_ERROR("Could not create a DrawTarget");
|
|
return nullptr;
|
|
}
|
|
|
|
|
|
// Create our drawable.
|
|
RefPtr<SourceSurface> innerSurface =
|
|
InnerImage()->GetFrame(aWhichFrame, aFlags);
|
|
NS_ENSURE_TRUE(innerSurface, nullptr);
|
|
nsRefPtr<gfxDrawable> drawable =
|
|
new gfxSurfaceDrawable(innerSurface, size);
|
|
|
|
// Draw.
|
|
nsRefPtr<gfxContext> ctx = new gfxContext(target);
|
|
ctx->Multiply(OrientationMatrix(size));
|
|
gfxUtils::DrawPixelSnapped(ctx, drawable, size,
|
|
ImageRegion::Create(size),
|
|
surfaceFormat, GraphicsFilter::FILTER_FAST);
|
|
|
|
return target->Snapshot();
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<SourceSurface>)
|
|
OrientedImage::GetFrameAtSize(const IntSize& aSize,
|
|
uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
{
|
|
// XXX(seth): It'd be nice to support downscale-during-decode for this case,
|
|
// but right now we just fall back to the intrinsic size.
|
|
return GetFrame(aWhichFrame, aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP_(bool)
|
|
OrientedImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
|
|
{
|
|
if (mOrientation.IsIdentity()) {
|
|
return InnerImage()->IsImageContainerAvailable(aManager, aFlags);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
|
|
OrientedImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
|
|
{
|
|
// XXX(seth): We currently don't have a way of orienting the result of
|
|
// GetImageContainer. We work around this by always returning null, but if it
|
|
// ever turns out that OrientedImage is widely used on codepaths that can
|
|
// actually benefit from GetImageContainer, it would be a good idea to fix
|
|
// that method for performance reasons.
|
|
|
|
if (mOrientation.IsIdentity()) {
|
|
return InnerImage()->GetImageContainer(aManager, aFlags);
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
struct MatrixBuilder
|
|
{
|
|
explicit MatrixBuilder(bool aInvert) : mInvert(aInvert) { }
|
|
|
|
gfxMatrix Build() { return mMatrix; }
|
|
|
|
void Scale(gfxFloat aX, gfxFloat aY)
|
|
{
|
|
if (mInvert) {
|
|
mMatrix *= gfxMatrix::Scaling(1.0 / aX, 1.0 / aY);
|
|
} else {
|
|
mMatrix.Scale(aX, aY);
|
|
}
|
|
}
|
|
|
|
void Rotate(gfxFloat aPhi)
|
|
{
|
|
if (mInvert) {
|
|
mMatrix *= gfxMatrix::Rotation(-aPhi);
|
|
} else {
|
|
mMatrix.Rotate(aPhi);
|
|
}
|
|
}
|
|
|
|
void Translate(gfxPoint aDelta)
|
|
{
|
|
if (mInvert) {
|
|
mMatrix *= gfxMatrix::Translation(-aDelta);
|
|
} else {
|
|
mMatrix.Translate(aDelta);
|
|
}
|
|
}
|
|
|
|
private:
|
|
gfxMatrix mMatrix;
|
|
bool mInvert;
|
|
};
|
|
|
|
/*
|
|
* OrientationMatrix() computes a matrix that applies the rotation and
|
|
* reflection specified by mOrientation, or that matrix's inverse if aInvert is
|
|
* true.
|
|
*
|
|
* @param aSize The scaled size of the inner image. (When outside code specifies
|
|
* the scaled size, as with imgIContainer::Draw and its aSize
|
|
* parameter, it's necessary to swap the width and height if
|
|
* mOrientation.SwapsWidthAndHeight() is true.)
|
|
* @param aInvert If true, compute the inverse of the orientation matrix. Prefer
|
|
* this approach to OrientationMatrix(..).Invert(), because it's
|
|
* more numerically accurate.
|
|
*/
|
|
gfxMatrix
|
|
OrientedImage::OrientationMatrix(const nsIntSize& aSize,
|
|
bool aInvert /* = false */)
|
|
{
|
|
MatrixBuilder builder(aInvert);
|
|
|
|
// Apply reflection, if present. (This logically happens second, but we
|
|
// apply it first because these transformations are all premultiplied.) A
|
|
// translation is necessary to place the image back in the first quadrant.
|
|
switch (mOrientation.flip) {
|
|
case Flip::Unflipped:
|
|
break;
|
|
case Flip::Horizontal:
|
|
if (mOrientation.SwapsWidthAndHeight()) {
|
|
builder.Translate(gfxPoint(aSize.height, 0));
|
|
} else {
|
|
builder.Translate(gfxPoint(aSize.width, 0));
|
|
}
|
|
builder.Scale(-1.0, 1.0);
|
|
break;
|
|
default:
|
|
MOZ_ASSERT(false, "Invalid flip value");
|
|
}
|
|
|
|
// Apply rotation, if present. Again, a translation is used to place the
|
|
// image back in the first quadrant.
|
|
switch (mOrientation.rotation) {
|
|
case Angle::D0:
|
|
break;
|
|
case Angle::D90:
|
|
builder.Translate(gfxPoint(aSize.height, 0));
|
|
builder.Rotate(-1.5 * M_PI);
|
|
break;
|
|
case Angle::D180:
|
|
builder.Translate(gfxPoint(aSize.width, aSize.height));
|
|
builder.Rotate(-1.0 * M_PI);
|
|
break;
|
|
case Angle::D270:
|
|
builder.Translate(gfxPoint(0, aSize.width));
|
|
builder.Rotate(-0.5 * M_PI);
|
|
break;
|
|
default:
|
|
MOZ_ASSERT(false, "Invalid rotation value");
|
|
}
|
|
|
|
return builder.Build();
|
|
}
|
|
|
|
static SVGImageContext
|
|
OrientViewport(const SVGImageContext& aOldContext,
|
|
const Orientation& aOrientation)
|
|
{
|
|
CSSIntSize viewportSize(aOldContext.GetViewportSize());
|
|
if (aOrientation.SwapsWidthAndHeight()) {
|
|
swap(viewportSize.width, viewportSize.height);
|
|
}
|
|
return SVGImageContext(viewportSize,
|
|
aOldContext.GetPreserveAspectRatio());
|
|
}
|
|
|
|
NS_IMETHODIMP_(DrawResult)
|
|
OrientedImage::Draw(gfxContext* aContext,
|
|
const nsIntSize& aSize,
|
|
const ImageRegion& aRegion,
|
|
uint32_t aWhichFrame,
|
|
GraphicsFilter aFilter,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
uint32_t aFlags)
|
|
{
|
|
if (mOrientation.IsIdentity()) {
|
|
return InnerImage()->Draw(aContext, aSize, aRegion,
|
|
aWhichFrame, aFilter, aSVGContext, aFlags);
|
|
}
|
|
|
|
// Update the image size to match the image's coordinate system. (This could
|
|
// be done using TransformBounds but since it's only a size a swap is enough.)
|
|
nsIntSize size(aSize);
|
|
if (mOrientation.SwapsWidthAndHeight()) {
|
|
swap(size.width, size.height);
|
|
}
|
|
|
|
// Update the matrix so that we transform the image into the orientation
|
|
// expected by the caller before drawing.
|
|
gfxMatrix matrix(OrientationMatrix(size));
|
|
gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
|
|
aContext->Multiply(matrix);
|
|
|
|
// The region is already in the orientation expected by the caller, but we
|
|
// need it to be in the image's coordinate system, so we transform it using
|
|
// the inverse of the orientation matrix.
|
|
gfxMatrix inverseMatrix(OrientationMatrix(size, /* aInvert = */ true));
|
|
ImageRegion region(aRegion);
|
|
region.TransformBoundsBy(inverseMatrix);
|
|
|
|
return InnerImage()->Draw(aContext, size, region, aWhichFrame, aFilter,
|
|
aSVGContext.map(OrientViewport, mOrientation),
|
|
aFlags);
|
|
}
|
|
|
|
nsIntSize
|
|
OrientedImage::OptimalImageSizeForDest(const gfxSize& aDest,
|
|
uint32_t aWhichFrame,
|
|
GraphicsFilter aFilter, uint32_t aFlags)
|
|
{
|
|
if (!mOrientation.SwapsWidthAndHeight()) {
|
|
return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
|
|
aFlags);
|
|
}
|
|
|
|
// Swap the size for the calculation, then swap it back for the caller.
|
|
gfxSize destSize(aDest.height, aDest.width);
|
|
nsIntSize innerImageSize(InnerImage()->OptimalImageSizeForDest(destSize,
|
|
aWhichFrame,
|
|
aFilter,
|
|
aFlags));
|
|
return nsIntSize(innerImageSize.height, innerImageSize.width);
|
|
}
|
|
|
|
NS_IMETHODIMP_(nsIntRect)
|
|
OrientedImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
|
|
{
|
|
nsIntRect rect(InnerImage()->GetImageSpaceInvalidationRect(aRect));
|
|
|
|
if (mOrientation.IsIdentity()) {
|
|
return rect;
|
|
}
|
|
|
|
nsIntSize innerSize;
|
|
nsresult rv = InnerImage()->GetWidth(&innerSize.width);
|
|
rv = NS_FAILED(rv) ? rv : InnerImage()->GetHeight(&innerSize.height);
|
|
if (NS_FAILED(rv)) {
|
|
// Fall back to identity if the width and height aren't available.
|
|
return rect;
|
|
}
|
|
|
|
// Transform the invalidation rect into the correct orientation.
|
|
gfxMatrix matrix(OrientationMatrix(innerSize, /* aInvert = */ true));
|
|
gfxRect invalidRect(matrix.TransformBounds(gfxRect(rect.x, rect.y,
|
|
rect.width, rect.height)));
|
|
invalidRect.RoundOut();
|
|
|
|
return nsIntRect(invalidRect.x, invalidRect.y,
|
|
invalidRect.width, invalidRect.height);
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|