mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +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)
320 lines
9.1 KiB
C++
320 lines
9.1 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 "MultipartImage.h"
|
|
|
|
#include "imgINotificationObserver.h"
|
|
|
|
namespace mozilla {
|
|
namespace image {
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// Helpers
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
class NextPartObserver : public IProgressObserver
|
|
{
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_TYPENAME(NextPartObserver)
|
|
NS_INLINE_DECL_REFCOUNTING(NextPartObserver, override)
|
|
|
|
explicit NextPartObserver(MultipartImage* aOwner)
|
|
: mOwner(aOwner)
|
|
{
|
|
MOZ_ASSERT(mOwner);
|
|
}
|
|
|
|
void BeginObserving(Image* aImage)
|
|
{
|
|
MOZ_ASSERT(aImage);
|
|
mImage = aImage;
|
|
|
|
nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
|
|
tracker->AddObserver(this);
|
|
}
|
|
|
|
void BlockUntilDecodedAndFinishObserving()
|
|
{
|
|
// Use GetFrame() to block until our image finishes decoding.
|
|
mImage->GetFrame(imgIContainer::FRAME_CURRENT,
|
|
imgIContainer::FLAG_SYNC_DECODE);
|
|
|
|
FinishObserving();
|
|
}
|
|
|
|
virtual void Notify(int32_t aType,
|
|
const nsIntRect* aRect = nullptr) override
|
|
{
|
|
if (!mImage) {
|
|
// We've already finished observing the last image we were given.
|
|
return;
|
|
}
|
|
|
|
if (aType == imgINotificationObserver::FRAME_COMPLETE) {
|
|
FinishObserving();
|
|
}
|
|
}
|
|
|
|
virtual void OnLoadComplete(bool aLastPart) override
|
|
{
|
|
if (!mImage) {
|
|
// We've already finished observing the last image we were given.
|
|
return;
|
|
}
|
|
|
|
// If there's already an error, we may never get a FRAME_COMPLETE
|
|
// notification, so go ahead and notify our owner right away.
|
|
nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
|
|
if (tracker->GetProgress() & FLAG_HAS_ERROR) {
|
|
FinishObserving();
|
|
}
|
|
}
|
|
|
|
// Other notifications are ignored.
|
|
virtual void BlockOnload() override { }
|
|
virtual void UnblockOnload() override { }
|
|
virtual void SetHasImage() override { }
|
|
virtual bool NotificationsDeferred() const override { return false; }
|
|
virtual void SetNotificationsDeferred(bool) override { }
|
|
|
|
private:
|
|
virtual ~NextPartObserver() { }
|
|
|
|
void FinishObserving()
|
|
{
|
|
MOZ_ASSERT(mImage);
|
|
|
|
nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
|
|
tracker->RemoveObserver(this);
|
|
mImage = nullptr;
|
|
|
|
mOwner->FinishTransition();
|
|
}
|
|
|
|
MultipartImage* mOwner;
|
|
nsRefPtr<Image> mImage;
|
|
};
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// Implementation
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
MultipartImage::MultipartImage(Image* aFirstPart)
|
|
: ImageWrapper(aFirstPart)
|
|
, mDeferNotifications(false)
|
|
{
|
|
mNextPartObserver = new NextPartObserver(this);
|
|
}
|
|
|
|
void
|
|
MultipartImage::Init()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mTracker, "Should've called SetProgressTracker() by now");
|
|
|
|
// Start observing the first part.
|
|
nsRefPtr<ProgressTracker> firstPartTracker =
|
|
InnerImage()->GetProgressTracker();
|
|
firstPartTracker->AddObserver(this);
|
|
InnerImage()->RequestDecode();
|
|
InnerImage()->IncrementAnimationConsumers();
|
|
}
|
|
|
|
MultipartImage::~MultipartImage()
|
|
{
|
|
// Ask our ProgressTracker to drop its weak reference to us.
|
|
mTracker->ResetImage();
|
|
}
|
|
|
|
NS_IMPL_QUERY_INTERFACE_INHERITED0(MultipartImage, ImageWrapper)
|
|
NS_IMPL_ADDREF(MultipartImage)
|
|
NS_IMPL_RELEASE(MultipartImage)
|
|
|
|
void
|
|
MultipartImage::BeginTransitionToPart(Image* aNextPart)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(aNextPart);
|
|
|
|
if (mNextPart) {
|
|
// Let the decoder catch up so we don't drop frames.
|
|
mNextPartObserver->BlockUntilDecodedAndFinishObserving();
|
|
MOZ_ASSERT(!mNextPart);
|
|
}
|
|
|
|
mNextPart = aNextPart;
|
|
|
|
// Start observing the next part; we'll complete the transition when
|
|
// NextPartObserver calls FinishTransition.
|
|
mNextPartObserver->BeginObserving(mNextPart);
|
|
mNextPart->RequestDecode();
|
|
mNextPart->IncrementAnimationConsumers();
|
|
}
|
|
|
|
void MultipartImage::FinishTransition()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mNextPart, "Should have a next part here");
|
|
|
|
nsRefPtr<ProgressTracker> newCurrentPartTracker =
|
|
mNextPart->GetProgressTracker();
|
|
if (newCurrentPartTracker->GetProgress() & FLAG_HAS_ERROR) {
|
|
// This frame has an error; drop it.
|
|
mNextPart = nullptr;
|
|
|
|
// We still need to notify, though.
|
|
mTracker->ResetForNewRequest();
|
|
nsRefPtr<ProgressTracker> currentPartTracker =
|
|
InnerImage()->GetProgressTracker();
|
|
mTracker->SyncNotifyProgress(currentPartTracker->GetProgress());
|
|
|
|
return;
|
|
}
|
|
|
|
// Stop observing the current part.
|
|
{
|
|
nsRefPtr<ProgressTracker> currentPartTracker =
|
|
InnerImage()->GetProgressTracker();
|
|
currentPartTracker->RemoveObserver(this);
|
|
}
|
|
|
|
// Make the next part become the current part.
|
|
mTracker->ResetForNewRequest();
|
|
SetInnerImage(mNextPart);
|
|
mNextPart = nullptr;
|
|
newCurrentPartTracker->AddObserver(this);
|
|
|
|
// Finally, send all the notifications for the new current part and send a
|
|
// FRAME_UPDATE notification so that observers know to redraw.
|
|
mTracker->SyncNotifyProgress(newCurrentPartTracker->GetProgress(),
|
|
GetMaxSizedIntRect());
|
|
}
|
|
|
|
already_AddRefed<imgIContainer>
|
|
MultipartImage::Unwrap()
|
|
{
|
|
// Although we wrap another image, we don't allow callers to unwrap as. As far
|
|
// as external code is concerned, MultipartImage is atomic.
|
|
nsCOMPtr<imgIContainer> image = this;
|
|
return image.forget();
|
|
}
|
|
|
|
already_AddRefed<ProgressTracker>
|
|
MultipartImage::GetProgressTracker()
|
|
{
|
|
MOZ_ASSERT(mTracker);
|
|
nsRefPtr<ProgressTracker> tracker = mTracker;
|
|
return tracker.forget();
|
|
}
|
|
|
|
void
|
|
MultipartImage::SetProgressTracker(ProgressTracker* aTracker)
|
|
{
|
|
MOZ_ASSERT(aTracker);
|
|
MOZ_ASSERT(!mTracker);
|
|
mTracker = aTracker;
|
|
}
|
|
|
|
nsresult
|
|
MultipartImage::OnImageDataAvailable(nsIRequest* aRequest,
|
|
nsISupports* aContext,
|
|
nsIInputStream* aInStr,
|
|
uint64_t aSourceOffset,
|
|
uint32_t aCount)
|
|
{
|
|
// Note that this method is special in that we forward it to the next part if
|
|
// one exists, and *not* the current part.
|
|
|
|
// We may trigger notifications that will free mNextPart, so keep it alive.
|
|
nsRefPtr<Image> nextPart = mNextPart;
|
|
if (nextPart) {
|
|
nextPart->OnImageDataAvailable(aRequest, aContext, aInStr,
|
|
aSourceOffset, aCount);
|
|
} else {
|
|
InnerImage()->OnImageDataAvailable(aRequest, aContext, aInStr,
|
|
aSourceOffset, aCount);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
MultipartImage::OnImageDataComplete(nsIRequest* aRequest,
|
|
nsISupports* aContext,
|
|
nsresult aStatus,
|
|
bool aLastPart)
|
|
{
|
|
// Note that this method is special in that we forward it to the next part if
|
|
// one exists, and *not* the current part.
|
|
|
|
// We may trigger notifications that will free mNextPart, so keep it alive.
|
|
nsRefPtr<Image> nextPart = mNextPart;
|
|
if (nextPart) {
|
|
nextPart->OnImageDataComplete(aRequest, aContext, aStatus, aLastPart);
|
|
} else {
|
|
InnerImage()->OnImageDataComplete(aRequest, aContext, aStatus, aLastPart);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
MultipartImage::Notify(int32_t aType, const nsIntRect* aRect /* = nullptr*/)
|
|
{
|
|
if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
|
|
mTracker->SyncNotifyProgress(FLAG_SIZE_AVAILABLE);
|
|
} else if (aType == imgINotificationObserver::FRAME_UPDATE) {
|
|
mTracker->SyncNotifyProgress(NoProgress, *aRect);
|
|
} else if (aType == imgINotificationObserver::FRAME_COMPLETE) {
|
|
mTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE);
|
|
} else if (aType == imgINotificationObserver::LOAD_COMPLETE) {
|
|
mTracker->SyncNotifyProgress(FLAG_LOAD_COMPLETE);
|
|
} else if (aType == imgINotificationObserver::DECODE_COMPLETE) {
|
|
mTracker->SyncNotifyProgress(FLAG_DECODE_COMPLETE);
|
|
} else if (aType == imgINotificationObserver::DISCARD) {
|
|
mTracker->OnDiscard();
|
|
} else if (aType == imgINotificationObserver::UNLOCKED_DRAW) {
|
|
mTracker->OnUnlockedDraw();
|
|
} else if (aType == imgINotificationObserver::IS_ANIMATED) {
|
|
mTracker->SyncNotifyProgress(FLAG_IS_ANIMATED);
|
|
} else if (aType == imgINotificationObserver::HAS_TRANSPARENCY) {
|
|
mTracker->SyncNotifyProgress(FLAG_HAS_TRANSPARENCY);
|
|
} else {
|
|
NS_NOTREACHED("Notification list should be exhaustive");
|
|
}
|
|
}
|
|
|
|
void
|
|
MultipartImage::OnLoadComplete(bool aLastPart)
|
|
{
|
|
Progress progress = FLAG_LOAD_COMPLETE;
|
|
if (aLastPart) {
|
|
progress |= FLAG_LAST_PART_COMPLETE;
|
|
}
|
|
mTracker->SyncNotifyProgress(progress);
|
|
}
|
|
|
|
void
|
|
MultipartImage::SetHasImage()
|
|
{
|
|
mTracker->OnImageAvailable();
|
|
}
|
|
|
|
bool
|
|
MultipartImage::NotificationsDeferred() const
|
|
{
|
|
return mDeferNotifications;
|
|
}
|
|
|
|
void
|
|
MultipartImage::SetNotificationsDeferred(bool aDeferNotifications)
|
|
{
|
|
mDeferNotifications = aDeferNotifications;
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|