mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
877b16186b
- Bug 1157954 - Report each surface in the ImageLib SurfaceCache individually in about:memory. r=dholbert (3810a2b1f) - Bug 1139641 - Return more information from SurfaceCache::Lookup and SurfaceCache::LookupBestMatch. r=dholbert (fdd62b01d) - Bug 1177615 - Rip everything related to FLAG_DECODE_STARTED out of ImageLib. r=tn (818a77ac1) - Bug 1153253 - move nsImageBoxFrame::mRequestRegistered to pack better with other members; r=dholbert (fe26ff0ce) - Bug 1177604 - Stop delaying the load event for XUL images until the image is decoded. r=tn (6c0100f5a) - Bug 1180931 (Part 1) - Allow sync size decoding for single core devices. r=tn (62eae65e3) - Bug 1180931 (Part 2) - Allow sync size decoding for transient (i.e. multipart) images. r=tn (537dea273) - Bug 1165009 - Bail in RasterImage::OnAddedFrame if we hit an error during decoding. r=tn (e9a85bf7d) - Bug 1171356 - On B2G, retry image decodes that fail because allocation of the first frame failed. r=tn (06e712f65) - Bug 1151166 - Fix two Coverity warnings in nsPNGDecoder.cpp. r=jrmuizel (848f4f0c2) - Bug 857040 - Warn on bad CRC instead of error exit. r=joe (74a6438ab) - Bug 1117607 - Make decoders responsible for their own frame allocations. r=tn (d224b33a8) - Bug 1178274 - Don't enable decode-only-on-draw if the APZ pref is true but e10s is disabled. r=dvander (76ca02965) - Bug 1177323 - disable decode-only-on-draw preference. r=seth (b6ac4e9b0) - Bug 1183836 - Remove support for decode-on-draw-only. r=tn (af0b79370) - Bug 1183852 - Only mark surfaces as used in the SurfaceCache if a caller requested exactly that surface. r=dholbert (e8d94d193) - Bug 1176124 (Part 1) - Add a MatchType enum to LookupResult to let Lookup*() return more detailed information. r=dholbert (b3b7b01c0) - Bug 1176124 (Part 2) - Add placeholder support to the SurfaceCache so we can avoid launching redundant decoders. r=dholbert (6fa4cae4d) - Bug 1185582 - Back out bug 1171356, a hack to retry image decoding which is now useless. r=tn (0bac6a812) - Bug 1155332 - If we don't have enough memory to fully decode an image, discard it immediately. r=tn (2adc2f8ea) - Bug 1185592 (Part 1) - Remove obsolete logging macros. r=baku (b1e98c8a8) - Bug 1185592 (Part 2) - Make RasterImage store the decoder type instead of the MIME type. r=baku (abce7fd06) - Bug 1186667 - Correctly report IMAGE_DECODE_COUNT and IMAGE_MAX_DECODE_COUNT telemetry for only non-size decodes. r=tn (97bfbbc82) - make WEBPDecoder comply Bug 1117607 - Make decoders responsible for their own frame allocation (03866748e) - make JXR decoder crudely compliant to 1117607 and make it allocate its frame - can probably be improved (b804d6f67)
319 lines
7.2 KiB
C++
319 lines
7.2 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_(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
|