mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +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)
327 lines
7.5 KiB
C++
327 lines
7.5 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 "ImageWrapper.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "Orientation.h"
|
|
|
|
#include "mozilla/MemoryReporting.h"
|
|
|
|
namespace mozilla {
|
|
|
|
using gfx::DataSourceSurface;
|
|
using gfx::SourceSurface;
|
|
using layers::LayerManager;
|
|
using layers::ImageContainer;
|
|
|
|
namespace image {
|
|
|
|
// Inherited methods from Image.
|
|
|
|
already_AddRefed<ProgressTracker>
|
|
ImageWrapper::GetProgressTracker()
|
|
{
|
|
return mInnerImage->GetProgressTracker();
|
|
}
|
|
|
|
size_t
|
|
ImageWrapper::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
|
|
{
|
|
return mInnerImage->SizeOfSourceWithComputedFallback(aMallocSizeOf);
|
|
}
|
|
|
|
void
|
|
ImageWrapper::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
|
|
MallocSizeOf aMallocSizeOf) const
|
|
{
|
|
mInnerImage->CollectSizeOfSurfaces(aCounters, aMallocSizeOf);
|
|
}
|
|
|
|
void
|
|
ImageWrapper::IncrementAnimationConsumers()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
|
|
"with DecrementAnimationConsumers");
|
|
mInnerImage->IncrementAnimationConsumers();
|
|
}
|
|
|
|
void
|
|
ImageWrapper::DecrementAnimationConsumers()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
|
|
"with IncrementAnimationConsumers");
|
|
mInnerImage->DecrementAnimationConsumers();
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
uint32_t
|
|
ImageWrapper::GetAnimationConsumers()
|
|
{
|
|
return mInnerImage->GetAnimationConsumers();
|
|
}
|
|
#endif
|
|
|
|
nsresult
|
|
ImageWrapper::OnImageDataAvailable(nsIRequest* aRequest,
|
|
nsISupports* aContext,
|
|
nsIInputStream* aInStr,
|
|
uint64_t aSourceOffset,
|
|
uint32_t aCount)
|
|
{
|
|
return mInnerImage->OnImageDataAvailable(aRequest, aContext, aInStr,
|
|
aSourceOffset, aCount);
|
|
}
|
|
|
|
nsresult
|
|
ImageWrapper::OnImageDataComplete(nsIRequest* aRequest,
|
|
nsISupports* aContext,
|
|
nsresult aStatus,
|
|
bool aLastPart)
|
|
{
|
|
return mInnerImage->OnImageDataComplete(aRequest, aContext, aStatus,
|
|
aLastPart);
|
|
}
|
|
|
|
void
|
|
ImageWrapper::OnSurfaceDiscarded()
|
|
{
|
|
return mInnerImage->OnSurfaceDiscarded();
|
|
}
|
|
|
|
void
|
|
ImageWrapper::SetInnerWindowID(uint64_t aInnerWindowId)
|
|
{
|
|
mInnerImage->SetInnerWindowID(aInnerWindowId);
|
|
}
|
|
|
|
uint64_t
|
|
ImageWrapper::InnerWindowID() const
|
|
{
|
|
return mInnerImage->InnerWindowID();
|
|
}
|
|
|
|
bool
|
|
ImageWrapper::HasError()
|
|
{
|
|
return mInnerImage->HasError();
|
|
}
|
|
|
|
void
|
|
ImageWrapper::SetHasError()
|
|
{
|
|
mInnerImage->SetHasError();
|
|
}
|
|
|
|
ImageURL*
|
|
ImageWrapper::GetURI()
|
|
{
|
|
return mInnerImage->GetURI();
|
|
}
|
|
|
|
// Methods inherited from XPCOM interfaces.
|
|
|
|
NS_IMPL_ISUPPORTS(ImageWrapper, imgIContainer)
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::GetWidth(int32_t* aWidth)
|
|
{
|
|
return mInnerImage->GetWidth(aWidth);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::GetHeight(int32_t* aHeight)
|
|
{
|
|
return mInnerImage->GetHeight(aHeight);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::GetIntrinsicSize(nsSize* aSize)
|
|
{
|
|
return mInnerImage->GetIntrinsicSize(aSize);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::GetIntrinsicRatio(nsSize* aSize)
|
|
{
|
|
return mInnerImage->GetIntrinsicRatio(aSize);
|
|
}
|
|
|
|
NS_IMETHODIMP_(Orientation)
|
|
ImageWrapper::GetOrientation()
|
|
{
|
|
return mInnerImage->GetOrientation();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::GetType(uint16_t* aType)
|
|
{
|
|
return mInnerImage->GetType(aType);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::GetAnimated(bool* aAnimated)
|
|
{
|
|
return mInnerImage->GetAnimated(aAnimated);
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<SourceSurface>)
|
|
ImageWrapper::GetFrame(uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
{
|
|
return mInnerImage->GetFrame(aWhichFrame, aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<SourceSurface>)
|
|
ImageWrapper::GetFrameAtSize(const IntSize& aSize,
|
|
uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
{
|
|
return mInnerImage->GetFrameAtSize(aSize, aWhichFrame, aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP_(bool)
|
|
ImageWrapper::IsOpaque()
|
|
{
|
|
return mInnerImage->IsOpaque();
|
|
}
|
|
|
|
NS_IMETHODIMP_(bool)
|
|
ImageWrapper::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
|
|
{
|
|
return mInnerImage->IsImageContainerAvailable(aManager, aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
|
|
ImageWrapper::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
|
|
{
|
|
return mInnerImage->GetImageContainer(aManager, aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP_(DrawResult)
|
|
ImageWrapper::Draw(gfxContext* aContext,
|
|
const nsIntSize& aSize,
|
|
const ImageRegion& aRegion,
|
|
uint32_t aWhichFrame,
|
|
GraphicsFilter aFilter,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
uint32_t aFlags)
|
|
{
|
|
return mInnerImage->Draw(aContext, aSize, aRegion, aWhichFrame,
|
|
aFilter, aSVGContext, aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::RequestDecode()
|
|
{
|
|
return mInnerImage->RequestDecode();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::StartDecoding()
|
|
{
|
|
return mInnerImage->StartDecoding();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags)
|
|
{
|
|
return mInnerImage->RequestDecodeForSize(aSize, aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::LockImage()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread(),
|
|
"Main thread to encourage serialization with UnlockImage");
|
|
return mInnerImage->LockImage();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::UnlockImage()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread(),
|
|
"Main thread to encourage serialization with LockImage");
|
|
return mInnerImage->UnlockImage();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::RequestDiscard()
|
|
{
|
|
return mInnerImage->RequestDiscard();
|
|
}
|
|
|
|
NS_IMETHODIMP_(void)
|
|
ImageWrapper::RequestRefresh(const TimeStamp& aTime)
|
|
{
|
|
return mInnerImage->RequestRefresh(aTime);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::GetAnimationMode(uint16_t* aAnimationMode)
|
|
{
|
|
return mInnerImage->GetAnimationMode(aAnimationMode);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::SetAnimationMode(uint16_t aAnimationMode)
|
|
{
|
|
return mInnerImage->SetAnimationMode(aAnimationMode);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ImageWrapper::ResetAnimation()
|
|
{
|
|
return mInnerImage->ResetAnimation();
|
|
}
|
|
|
|
NS_IMETHODIMP_(float)
|
|
ImageWrapper::GetFrameIndex(uint32_t aWhichFrame)
|
|
{
|
|
return mInnerImage->GetFrameIndex(aWhichFrame);
|
|
}
|
|
|
|
NS_IMETHODIMP_(int32_t)
|
|
ImageWrapper::GetFirstFrameDelay()
|
|
{
|
|
return mInnerImage->GetFirstFrameDelay();
|
|
}
|
|
|
|
NS_IMETHODIMP_(void)
|
|
ImageWrapper::SetAnimationStartTime(const TimeStamp& aTime)
|
|
{
|
|
mInnerImage->SetAnimationStartTime(aTime);
|
|
}
|
|
|
|
void
|
|
ImageWrapper::PropagateUseCounters(nsIDocument* aParentDocument)
|
|
{
|
|
mInnerImage->PropagateUseCounters(aParentDocument);
|
|
}
|
|
|
|
nsIntSize
|
|
ImageWrapper::OptimalImageSizeForDest(const gfxSize& aDest,
|
|
uint32_t aWhichFrame,
|
|
GraphicsFilter aFilter, uint32_t aFlags)
|
|
{
|
|
return mInnerImage->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
|
|
aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP_(nsIntRect)
|
|
ImageWrapper::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
|
|
{
|
|
return mInnerImage->GetImageSpaceInvalidationRect(aRect);
|
|
}
|
|
|
|
already_AddRefed<imgIContainer>
|
|
ImageWrapper::Unwrap()
|
|
{
|
|
return mInnerImage->Unwrap();
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|