mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
15db8f16bf
- Bug 1132854 - Remove the gfx::ToIntSize conversion helper. r=Bas (0ee451e53) - Bug 1020179 - Let PContent manage PContentPermissionRequest. r=fabrice, r=khuey (caf96b54e) - Bug 1153023 - Convert TabParent::mChromeOffset to a LayoutDeviceIntPoint. r=billm (ba338584a) - Bug 1139033 - Don't schedule an unnecessary repeat transaction when doing a non-progressive paint. r=nical (9c77d9318) - Bug 1137203 - Ignore the critical displayport when a layer is subject to OMTA relative to the scrolling ancestor. r=BenWa (c9bedfb1e) - Bug 1137203 - Cleanup to ditch the fast-path code entirely and just prevent progressive drawing in the equivalent scenarios. r=BenWa (6bc5b8813) - Bug 1128042 - Don't round critical displayport out as it should already be tile aligned and rounding error can increase tile usage. r=botond (03e34e2c5) - Bug 1149461 - Disable progressive drawing unless the compositor is actively scrolling a tiled layer. r=nical (7a3de28cb) - Bug 1152838 - Correctly inflate valid regions to tile boundaries. r=mattwoodrow (7a496f645) - Bug 1148971 - Make nsITheme::GetMinimumWidgetSize return a LayoutDeviceIntSize result instead of the unit-less nsIntSize type. r=roc (c34ddc478) - Bug 1155621 - Make nsIntRect and nsIntPoint typedefs of mozilla::gfx::IntRect and mozilla::gfx::IntPoint. r=Bas (9901a37f6) - Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan (794739bd3) - Bug 1156632 - Remove unused forward class declarations - patch 6 - the rest of the tree, r=ehsan (63a2c4cb4) - Bug 1161634 - Allow synthesizing native mouse-scroll events on Linux. r=karlt (b88c1f367) - Bug 1161634 - Enable the test_wheel_scroll on Linux as well. r=mstange (7dab62ad4) - Bug 1144643 - Render tooltips as transparent on Gtk3. r=karlt (80f7fa312) - Bug 1174966 part 1 - Change type of mCancelledPointerLockRequests field from uint32_t to bit field. r=smaug (ef235c33e) - Bug 1155030 - Fix asterix/asterisk misspelling. r=ehsan (edb769304) - Bug 1149194 - Don't use uninitialized value in ComputedTimingFunction::operator==. r=bbirtles (6bc804d45) - Bug 1151346 - Make ActiveLayerTracker::IsOffsetOrMarginStyleAnimated respect CSS animations. r=roc (2c3f24ba0) - Bug 1151346 - Back out the important part again because of bug 1151889. (002b0e67b) - Bug 1122414 part 1 - Factor out a TransitionProperty method in ElementPropertyTransition; r=jwatt (ddbbdb04c) - Bug 1122414 part 2 - Return the transitionProperty from Animation.name for CSS transitions; r=jwatt (689251b93) - Bug 1122414 part 3 - Update DevTools tests to expect a name for transitions; r=pbrosset (f0d7e57e9) - Bug 1149999 - 1 - Display transition names in animation-panel now that they have names; r=past (ea3d8d552) - Bug 1120343 - 1 - Allow setting animations' currentTime by clicking/dragging the timeline; r=miker (936996d21) - Bug 1120343 - 2 - Add rewind and fast-forward buttons to animation player widgets; r=miker (95eddc465) - Bug 1120343 - 3 - Tests for the current time control in the animation panel; r=miker (b8a93f858) - Bug 1110762 - Add a setCurrentTime method to the animation actor; r=past (d0dae8967) - Bug 1123851 - 1 - Element geometry highlighter; r=bgrins (89b1a83bf) - Bug 1123851 - 2 - Tests for the element geometry highlighter; r=bgrins (7542bcab0) - add missing part of accessing first element from Bug 1139925 - Make the BoxModelHighlighter highlight all quads (b5c6076c1) - Bug 1139186 - 1 - Refactor to the native anon nodes manipulation in highlighters; r=bgrins (a454aefbf) - Bug 1139186 - 2 - Add event handling support to CanvasFrameAnonymousContentHelper; r=bgrins (a705c2716) - Bug 1120339 - Add setPlaybackRate method to AnimationPlayerActor; r=past (efa167a19) - Bug 1120833 - 2 - Fire events about changed animations in the AnimationsActor; r=past (4b5fddd23) - Bug 1120833 - 1 - Remove EventEmitter usage in AnimationPlayerFront (21186e616)
318 lines
9.1 KiB
C++
318 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 void OnStartDecode() 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* aImage, ProgressTracker* aTracker)
|
|
: ImageWrapper(aImage)
|
|
, mDeferNotifications(false)
|
|
{
|
|
MOZ_ASSERT(aTracker);
|
|
mProgressTrackerInit = new ProgressTrackerInit(this, aTracker);
|
|
mNextPartObserver = new NextPartObserver(this);
|
|
|
|
// Start observing the first part.
|
|
nsRefPtr<ProgressTracker> firstPartTracker =
|
|
InnerImage()->GetProgressTracker();
|
|
firstPartTracker->AddObserver(this);
|
|
InnerImage()->RequestDecode();
|
|
InnerImage()->IncrementAnimationConsumers();
|
|
}
|
|
|
|
MultipartImage::~MultipartImage() { }
|
|
|
|
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();
|
|
}
|
|
|
|
void
|
|
MultipartImage::OnStartDecode()
|
|
{
|
|
mTracker->SyncNotifyProgress(FLAG_DECODE_STARTED);
|
|
}
|
|
|
|
bool
|
|
MultipartImage::NotificationsDeferred() const
|
|
{
|
|
return mDeferNotifications;
|
|
}
|
|
|
|
void
|
|
MultipartImage::SetNotificationsDeferred(bool aDeferNotifications)
|
|
{
|
|
mDeferNotifications = aDeferNotifications;
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|