mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
8a0a002cf2
- Bug 1148708: Add missing 'override' annotations in DocAccessibleChild.h. rs=ehsan (d606358545)
- Bug 1210408 - make nsMaiInterfaceAction work with proxies, r=tbsaunde (f7c819c6ae)
- Bug 1210407 - teach nsMaiInterfaceTable to use proxies, r=tbsaunde (4ca4f10b5f)
- bug 1185157 make sure we don't send an event to a destroyed ipc document r=billm (23acf53f75)
- bug 1214864 - make SetCarretOffset() async r=davidb (e3079e9b2d)
- missing of Bug 1139972 - IPC Proxy for charAt, r=tbsaunde (e9593ed752)
- bug 1191598 - Pass MOZ_CURRENT_PROJECT in environment when running post-build automation steps for universal mac builds. r=gps (fc342c6ced)
- Bug 1164596 - Add mach android-emulator command; r=ahal (afeb9b27d1)
- Bug 1223149 - Add basic usage documentation for mach build; r=glandium (bfb802d175)
- Bug 1182301 - Improve 'mach build' notifications. r=gps (2c65a122d1)
- Bug 1184696 - Add clobber targets to |mach clobber|; Ability to clobber compiled python files, r=gps (35d8be292e)
- Bug 1117958 - Allow any debugging options to the run or gtest mach subcommands to automatically enable debugging. r=gps (32f986af4b)
- Bug 1180081 - Properly rebuild gtest/libxul before running gtests. r=gps (80db9a3d49)
- Bug 1171647, part 1 - Define a new function to convert the mode to a string. r=njn (61ad16f5ba)
- Bug 1171647, part 2 - Remove redundant assertion for dark matter mode. r=njn (b5ac9519f3)
- Bug 1058178, part 1 - Implement DMD heap scanning mode. r=njn (60e1079536)
- Bug 1058178, part 2 - Implement address clamping analysis for DMD scan logs. r=njn (45c0326b93)
- Bug 1102388 - Fix DMD static constructor ordering dependency. r=mccr8 (59b87897a1)
- Bug 1128705 - Don't redefine PAGE_SIZE in DMD if it's already defined. r=erahm (49216348ee)
- Bug 1179042 - Add a script for analyzing memory blocks using a heap scan DMD log. r=njn DONTBUILD (1c08d2d66e)
- Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat (1c999d139b)
- Bug 1158772 - fix non-idiomatic memset call in nsDeque.cpp; r=erahm (de6b555245)
- Bug 1199400 - Part 1: Use CheckedInt when growing nsDeque capacity. r=froydnj (dfdf6814a3)
- Bug 1199400 - Part 0: Remove unused nsDequeIterator. r=froydnj (38d69d7f47)
- Bug 1199400 - Part 2: Add tests for possible nsDeque corner cases. r=froydnj (931baff195)
- Bug 1201997 - Part 1 - Converted compiled test to gtest for nsDeque class. Added tests to test untested methods. r=froydn (e893916651)
- Bug 1201997 - Part 2 - Removing unused methods from the nsDeque class. r=froydn (41595a90ac)
- Bug 1201997 - Part 3 - Make internally used methods private. r=froydn (8cd3afd96f)
- Bug 1201997 - Part 4 - Change size and offset variables to size_t.r=froydn (73eabc8d60)
- Bug 1215140 P1 Add an nsIConsoleReportCollector interface to support navigation channel logging. r=bz (8a41535e2b)
- Bug 1215140 P2 Make HttpBaseChannel implement nsIConsoleReportCollector. r=bz (75fca301f2)
- Bug 1197679 - If nsUnknownDecoder is involved in e10s DivertToParent can break. r=jduell (5d94a12504)
- Bug 1178991 - smartptr for http converter r=hurley (8e7fbc8443)
- bug 366559 - patch 2, fix nsHTTPCompressConv indentation r=bagder (ba762da587)
- bug 366559 - patch 3, fix nsHTTPCompressConv bracing style r=bagder (54195ab451)
- bits of bug 366559 - patch 7, content-encoding brotli for http (f0b4051022)
- Bug 1205112 - Make PushEvent.data nullable. r=mt,smaug (775db32856)
- Bug 1193414 - SharedWorkers thread should be kept alive also when the SharedWorker object is CCed, r=khuey (b77ea8125c)
- Bug 1206520: Add about:config prefs to enable throwing on asm.js validation failures; r=bz (c42126665d)
- Bug 1193414 - Telemetry for SharedWorker spawning. r=bkelly (77984b7bcc)
- Bug 1205676 - Enable WPT service-worker/unregister-then-register-new-script.https.html in e10s, r=nsm (ec24939cf6)
- Bug 1193133 - Throw when calling postMessage from a Service Worker dom object with no global. r=bkelly (526dcacfab)
- Bug 1181871 P1 Only enforce Cache Context shared data destruction on target thread after init. r=ehsan (cdbf3ed3a8)
- Bug 1181871 P2 Fix ServiceWorkerManager usage of stack-based ErrorResult. r=ehsan (c449195d90)
- minor cleanup and missing bit of 1198230 (02f459db05)
- Bug 1143717 - Implement the ServiceWorkerMessageEvent interface. r=baku (027b3465f2)
- fix misspatch (708eee4e84)
- Bug 1188545 - Disentangle service workers from shared workers and refactor event dispatching code into a separate class. r=nsm,mrbkap (fb5b5341c9)
- Bug 1205228 - Change PackagedAppVerifier to notify the verification result asynchronously. r=valentin. (9edda0fa00)
- Bug 1178518 - Packaged App Utils. r=valentin (f60f3b7a93)
- Bug 1213150 - Part 1: Add a nsContentUtils::IsNonSubresourceRequest helper; r=jdm (b509cc3cc9)
- Bug 1213150 - Part 2: Rework ShouldPrepareForIntercept() in terms of subresource requests; r=jdm (2e92fe8780)
- Bug 1213150 - Part 3: Remove nsIInterceptedChannel.isNavigation; r=jdm (becf1cc12f)
- Bug 1213150 follow-up: fix build bustage (8d73d6ca73)
- Bug 1198394 - Part 1: Allow interception of HSTS upgraded connections in non-e10s mode; r=mcmanus (f504c5be08)
- Bug 1198394 - Part 2: Add a test for interception of HSTS upgraded connections; r=jdm (054e984eef)
- Bug 1187011 - Don't allow response body with null body status. r=bkelly (b1860741d1)
- missing bit of 1140788 (29d319712e)
- Bug 1213436 - Reject core dumps with node IDs that don't fit in an IEEE 754 double; r=sfink (3c1f6fdda0)
- Bug 1211006 - Add Debugger.Source.prototype.canonicalId; r=ejpbruel (eef7b79fce)
- Bug 1199218 - Implement JS::ubi::Node::size for js::LazyScript referents; r=sfink (098a48d240)
- Bug 1220031 - Add JS::ubi::Node::scriptFilename; r=sfink (6b824ae680)
- Bug 1143575. Remove unused MediaQueue::Empty. r=cpearce (de737f3433)
- Bug 1209933 - Make sure all parent runtime pointers are the topmost parent, r=billm. (fe824d967d)
- Bug 1197012 - Fix ThrowTypeError in Notification. r=mccr8 (0b1a097526)
- Bug 1197893 - Check the number of arguments for ThrowTypeError() and ThrowRangeError() at compile time. r=peterv (d98c7d78a0)
- Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus (0c8961fe17)
- Bug 1187159 - Add mochitest for loading packaged apps (iframe+fetch+mozapp) r=jduell (ce90ea561b)
- Bug 1186290 - Notify TabParent to switch process when loading a signed package. r=honzab, r=kanru. (c58a14554a)
- fix (15e2df75eb)
- Bug 1206124 P1 Fix "same-origin" CORS credentials in FetchDriver. r=ehsan (fae1bb6ab3)
- Bug 1206124 P2 Test fetch() with credentials and redirects. r=ehsan (ffc6254112)
- Bug 1211751: Remove nsIChannelEventSink-forwarding from EventSource and FetchDriver. It's never needed. r=smaug (adafe5737a)
- Bug 1212433 Fail fetch() calls that require preflight and also redirect. r=sicking a=abillings (c0d6742b9e)
- Bug 1193128 - Fix base64 decoding when fetching data URIs. r=baku (80bafa291a)
- Bug 1195167 part 1: Let necko handle all protocols. r=bkelly (bb932b0ada)
- Bug 1195167 part 2: Remove redundant aCORSFlag argument and instead use mCORSFlagEverSet. r=bkelly (beadafcad0)
- Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly (d00b38db9e)
- Bug 1195167 part 4: Remove FetchDriver::BasicFetch since it is empty. r=bkelly (c5ed097267)
- Bug 1210413 P2 Test CORS credentials on cross-origin redirects. r=sicking a=dveditz (b4eeb8aac0)
- Bug 1210413 P1 Propagate new channel load flags from child to parent on redirect. r=jduell a=dveditz (8b329af4fa)
- Bug 1195167 part 5: Make FetchDriver use AsyncOpen2. r=bkelly (cc217c4cc1)
- Bug 1195167 part 6: Some code simplification since necko handles fetch recursion. r=bkelly (f3b6da2262)
- Bug 1195167: Followup to fix test which I forgot to change (81e7439a2e)
- Bug 1215746: Remove RequestMode::Cors_with_forced_preflight. r=bkelly (0336e812b6)
- Bug 1211000: Move CORS preflight logic from nsCORSListenerProxy to nsCORSPreflightListener. r=ehsan (bf2f71cf22)
- missing bit of Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya (f6bc074e33)
- Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb (5af6fa7442)
- fix (e40c8e7625)
- Bug 1173811 - Part 1: Propagate the response URL to intercepted channels when necessary (non-e10s). r=mayhemer,bkelly (26f4f13c28)
- Bug 1173811 - Part 2: Propagate the response URL to intercepted channels when necessary (e10s). r=mayhemer,bkelly (a603fe1df2)
- Bug 1154309 - Add New Resource Timing Fields r=bz,hurley (1d14eb6bef)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (a5d18bb637)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (fb07d2c8aa)
- Bug 1212904 P1 Add a LoadTainting enumeration. r=jduell (a1db8a3e99)
- Bug 1212904 P2 Add LoadTainting information to nsILoadInfo. r=jduell (2482e5e334)
- Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell (aae73129b6)
- Bug 1045891 - CSP 2 child-src implementation r=ckerschb (792920aeb9)
- Bug 1219931 - CSP: Don't allow removing a policy (r=sicking) (9daaab4186)
- Bug 1208661 - Dump client-side layer textures. r=BenWa (1f2d17d515)
815 lines
27 KiB
C++
815 lines
27 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 "FrameAnimator.h"
|
|
|
|
#include "mozilla/MemoryReporting.h"
|
|
#include "mozilla/Move.h"
|
|
#include "imgIContainer.h"
|
|
#include "LookupResult.h"
|
|
#include "MainThreadUtils.h"
|
|
#include "RasterImage.h"
|
|
|
|
#include "pixman.h"
|
|
|
|
namespace mozilla {
|
|
|
|
using namespace gfx;
|
|
|
|
namespace image {
|
|
|
|
int32_t
|
|
FrameAnimator::GetSingleLoopTime() const
|
|
{
|
|
// If we aren't done decoding, we don't know the image's full play time.
|
|
if (!mDoneDecoding) {
|
|
return -1;
|
|
}
|
|
|
|
// If we're not looping, a single loop time has no meaning
|
|
if (mAnimationMode != imgIContainer::kNormalAnimMode) {
|
|
return -1;
|
|
}
|
|
|
|
uint32_t looptime = 0;
|
|
for (uint32_t i = 0; i < mImage->GetNumFrames(); ++i) {
|
|
int32_t timeout = GetTimeoutForFrame(i);
|
|
if (timeout >= 0) {
|
|
looptime += static_cast<uint32_t>(timeout);
|
|
} else {
|
|
// If we have a frame that never times out, we're probably in an error
|
|
// case, but let's handle it more gracefully.
|
|
NS_WARNING("Negative frame timeout - how did this happen?");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
return looptime;
|
|
}
|
|
|
|
TimeStamp
|
|
FrameAnimator::GetCurrentImgFrameEndTime() const
|
|
{
|
|
TimeStamp currentFrameTime = mCurrentAnimationFrameTime;
|
|
int32_t timeout =
|
|
GetTimeoutForFrame(mCurrentAnimationFrameIndex);
|
|
|
|
if (timeout < 0) {
|
|
// We need to return a sentinel value in this case, because our logic
|
|
// doesn't work correctly if we have a negative timeout value. We use
|
|
// one year in the future as the sentinel because it works with the loop
|
|
// in RequestRefresh() below.
|
|
// XXX(seth): It'd be preferable to make our logic work correctly with
|
|
// negative timeouts.
|
|
return TimeStamp::NowLoRes() +
|
|
TimeDuration::FromMilliseconds(31536000.0);
|
|
}
|
|
|
|
TimeDuration durationOfTimeout =
|
|
TimeDuration::FromMilliseconds(static_cast<double>(timeout));
|
|
TimeStamp currentFrameEndTime = currentFrameTime + durationOfTimeout;
|
|
|
|
return currentFrameEndTime;
|
|
}
|
|
|
|
FrameAnimator::RefreshResult
|
|
FrameAnimator::AdvanceFrame(TimeStamp aTime)
|
|
{
|
|
NS_ASSERTION(aTime <= TimeStamp::Now(),
|
|
"Given time appears to be in the future");
|
|
|
|
uint32_t currentFrameIndex = mCurrentAnimationFrameIndex;
|
|
uint32_t nextFrameIndex = currentFrameIndex + 1;
|
|
int32_t timeout = 0;
|
|
|
|
RefreshResult ret;
|
|
RawAccessFrameRef nextFrame = GetRawFrame(nextFrameIndex);
|
|
|
|
// If we're done decoding, we know we've got everything we're going to get.
|
|
// If we aren't, we only display fully-downloaded frames; everything else
|
|
// gets delayed.
|
|
bool canDisplay = mDoneDecoding ||
|
|
(nextFrame && nextFrame->IsImageComplete());
|
|
|
|
if (!canDisplay) {
|
|
// Uh oh, the frame we want to show is currently being decoded (partial)
|
|
// Wait until the next refresh driver tick and try again
|
|
return ret;
|
|
}
|
|
|
|
// If we're done decoding the next frame, go ahead and display it now and
|
|
// reinit with the next frame's delay time.
|
|
if (mImage->GetNumFrames() == nextFrameIndex) {
|
|
// End of an animation loop...
|
|
|
|
// If we are not looping forever, initialize the loop counter
|
|
if (mLoopRemainingCount < 0 && LoopCount() >= 0) {
|
|
mLoopRemainingCount = LoopCount();
|
|
}
|
|
|
|
// If animation mode is "loop once", or we're at end of loop counter,
|
|
// it's time to stop animating.
|
|
if (mAnimationMode == imgIContainer::kLoopOnceAnimMode ||
|
|
mLoopRemainingCount == 0) {
|
|
ret.animationFinished = true;
|
|
}
|
|
|
|
nextFrameIndex = 0;
|
|
|
|
if (mLoopRemainingCount > 0) {
|
|
mLoopRemainingCount--;
|
|
}
|
|
|
|
// If we're done, exit early.
|
|
if (ret.animationFinished) {
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
timeout = GetTimeoutForFrame(nextFrameIndex);
|
|
|
|
// Bad data
|
|
if (timeout < 0) {
|
|
ret.animationFinished = true;
|
|
ret.error = true;
|
|
}
|
|
|
|
if (nextFrameIndex == 0) {
|
|
ret.dirtyRect = mFirstFrameRefreshArea;
|
|
} else {
|
|
// Change frame
|
|
if (nextFrameIndex != currentFrameIndex + 1) {
|
|
nextFrame = GetRawFrame(nextFrameIndex);
|
|
}
|
|
|
|
if (!DoBlend(&ret.dirtyRect, currentFrameIndex,
|
|
nextFrameIndex)) {
|
|
// something went wrong, move on to next
|
|
NS_WARNING("FrameAnimator::AdvanceFrame(): Compositing of frame failed");
|
|
nextFrame->SetCompositingFailed(true);
|
|
mCurrentAnimationFrameTime = GetCurrentImgFrameEndTime();
|
|
mCurrentAnimationFrameIndex = nextFrameIndex;
|
|
|
|
ret.error = true;
|
|
return ret;
|
|
}
|
|
|
|
nextFrame->SetCompositingFailed(false);
|
|
}
|
|
|
|
mCurrentAnimationFrameTime = GetCurrentImgFrameEndTime();
|
|
|
|
// If we can get closer to the current time by a multiple of the image's loop
|
|
// time, we should.
|
|
uint32_t loopTime = GetSingleLoopTime();
|
|
if (loopTime > 0) {
|
|
TimeDuration delay = aTime - mCurrentAnimationFrameTime;
|
|
if (delay.ToMilliseconds() > loopTime) {
|
|
// Explicitly use integer division to get the floor of the number of
|
|
// loops.
|
|
uint32_t loops = static_cast<uint32_t>(delay.ToMilliseconds()) / loopTime;
|
|
mCurrentAnimationFrameTime +=
|
|
TimeDuration::FromMilliseconds(loops * loopTime);
|
|
}
|
|
}
|
|
|
|
// Set currentAnimationFrameIndex at the last possible moment
|
|
mCurrentAnimationFrameIndex = nextFrameIndex;
|
|
|
|
// If we're here, we successfully advanced the frame.
|
|
ret.frameAdvanced = true;
|
|
|
|
return ret;
|
|
}
|
|
|
|
FrameAnimator::RefreshResult
|
|
FrameAnimator::RequestRefresh(const TimeStamp& aTime)
|
|
{
|
|
// only advance the frame if the current time is greater than or
|
|
// equal to the current frame's end time.
|
|
TimeStamp currentFrameEndTime = GetCurrentImgFrameEndTime();
|
|
|
|
// By default, an empty RefreshResult.
|
|
RefreshResult ret;
|
|
|
|
while (currentFrameEndTime <= aTime) {
|
|
TimeStamp oldFrameEndTime = currentFrameEndTime;
|
|
|
|
RefreshResult frameRes = AdvanceFrame(aTime);
|
|
|
|
// Accumulate our result for returning to callers.
|
|
ret.Accumulate(frameRes);
|
|
|
|
currentFrameEndTime = GetCurrentImgFrameEndTime();
|
|
|
|
// if we didn't advance a frame, and our frame end time didn't change,
|
|
// then we need to break out of this loop & wait for the frame(s)
|
|
// to finish downloading
|
|
if (!frameRes.frameAdvanced && (currentFrameEndTime == oldFrameEndTime)) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void
|
|
FrameAnimator::ResetAnimation()
|
|
{
|
|
mCurrentAnimationFrameIndex = 0;
|
|
mLastCompositedFrameIndex = -1;
|
|
}
|
|
|
|
void
|
|
FrameAnimator::SetDoneDecoding(bool aDone)
|
|
{
|
|
mDoneDecoding = aDone;
|
|
}
|
|
|
|
void
|
|
FrameAnimator::SetAnimationMode(uint16_t aAnimationMode)
|
|
{
|
|
mAnimationMode = aAnimationMode;
|
|
}
|
|
|
|
void
|
|
FrameAnimator::InitAnimationFrameTimeIfNecessary()
|
|
{
|
|
if (mCurrentAnimationFrameTime.IsNull()) {
|
|
mCurrentAnimationFrameTime = TimeStamp::Now();
|
|
}
|
|
}
|
|
|
|
void
|
|
FrameAnimator::SetAnimationFrameTime(const TimeStamp& aTime)
|
|
{
|
|
mCurrentAnimationFrameTime = aTime;
|
|
}
|
|
|
|
void
|
|
FrameAnimator::UnionFirstFrameRefreshArea(const nsIntRect& aRect)
|
|
{
|
|
mFirstFrameRefreshArea.UnionRect(mFirstFrameRefreshArea, aRect);
|
|
}
|
|
|
|
uint32_t
|
|
FrameAnimator::GetCurrentAnimationFrameIndex() const
|
|
{
|
|
return mCurrentAnimationFrameIndex;
|
|
}
|
|
|
|
nsIntRect
|
|
FrameAnimator::GetFirstFrameRefreshArea() const
|
|
{
|
|
return mFirstFrameRefreshArea;
|
|
}
|
|
|
|
LookupResult
|
|
FrameAnimator::GetCompositedFrame(uint32_t aFrameNum)
|
|
{
|
|
MOZ_ASSERT(aFrameNum != 0, "First frame is never composited");
|
|
|
|
// If we have a composited version of this frame, return that.
|
|
if (mLastCompositedFrameIndex == int32_t(aFrameNum)) {
|
|
return LookupResult(mCompositingFrame->DrawableRef(), MatchType::EXACT);
|
|
}
|
|
|
|
// Otherwise return the raw frame. DoBlend is required to ensure that we only
|
|
// hit this case if the frame is not paletted and doesn't require compositing.
|
|
LookupResult result =
|
|
SurfaceCache::Lookup(ImageKey(mImage),
|
|
RasterSurfaceKey(mSize,
|
|
DefaultSurfaceFlags(),
|
|
aFrameNum));
|
|
MOZ_ASSERT(!result || !result.DrawableRef()->GetIsPaletted(),
|
|
"About to return a paletted frame");
|
|
return result;
|
|
}
|
|
|
|
int32_t
|
|
FrameAnimator::GetTimeoutForFrame(uint32_t aFrameNum) const
|
|
{
|
|
int32_t rawTimeout = 0;
|
|
|
|
RawAccessFrameRef frame = GetRawFrame(aFrameNum);
|
|
if (frame) {
|
|
AnimationData data = frame->GetAnimationData();
|
|
rawTimeout = data.mRawTimeout;
|
|
} else if (aFrameNum == 0) {
|
|
rawTimeout = mFirstFrameTimeout;
|
|
} else {
|
|
NS_WARNING("No frame; called GetTimeoutForFrame too early?");
|
|
return 100;
|
|
}
|
|
|
|
// Ensure a minimal time between updates so we don't throttle the UI thread.
|
|
// consider 0 == unspecified and make it fast but not too fast. Unless we
|
|
// have a single loop GIF. See bug 890743, bug 125137, bug 139677, and bug
|
|
// 207059. The behavior of recent IE and Opera versions seems to be:
|
|
// IE 6/Win:
|
|
// 10 - 50ms go 100ms
|
|
// >50ms go correct speed
|
|
// Opera 7 final/Win:
|
|
// 10ms goes 100ms
|
|
// >10ms go correct speed
|
|
// It seems that there are broken tools out there that set a 0ms or 10ms
|
|
// timeout when they really want a "default" one. So munge values in that
|
|
// range.
|
|
if (rawTimeout >= 0 && rawTimeout <= 10) {
|
|
return 100;
|
|
}
|
|
|
|
return rawTimeout;
|
|
}
|
|
|
|
static void
|
|
DoCollectSizeOfCompositingSurfaces(const RawAccessFrameRef& aSurface,
|
|
SurfaceMemoryCounterType aType,
|
|
nsTArray<SurfaceMemoryCounter>& aCounters,
|
|
MallocSizeOf aMallocSizeOf)
|
|
{
|
|
// Concoct a SurfaceKey for this surface.
|
|
SurfaceKey key = RasterSurfaceKey(aSurface->GetImageSize(),
|
|
DefaultSurfaceFlags(),
|
|
/* aFrameNum = */ 0);
|
|
|
|
// Create a counter for this surface.
|
|
SurfaceMemoryCounter counter(key, /* aIsLocked = */ true, aType);
|
|
|
|
// Extract the surface's memory usage information.
|
|
size_t heap = 0, nonHeap = 0;
|
|
aSurface->AddSizeOfExcludingThis(aMallocSizeOf, heap, nonHeap);
|
|
counter.Values().SetDecodedHeap(heap);
|
|
counter.Values().SetDecodedNonHeap(nonHeap);
|
|
|
|
// Record it.
|
|
aCounters.AppendElement(counter);
|
|
}
|
|
|
|
void
|
|
FrameAnimator::CollectSizeOfCompositingSurfaces(
|
|
nsTArray<SurfaceMemoryCounter>& aCounters,
|
|
MallocSizeOf aMallocSizeOf) const
|
|
{
|
|
if (mCompositingFrame) {
|
|
DoCollectSizeOfCompositingSurfaces(mCompositingFrame,
|
|
SurfaceMemoryCounterType::COMPOSITING,
|
|
aCounters,
|
|
aMallocSizeOf);
|
|
}
|
|
|
|
if (mCompositingPrevFrame) {
|
|
DoCollectSizeOfCompositingSurfaces(mCompositingPrevFrame,
|
|
SurfaceMemoryCounterType::COMPOSITING_PREV,
|
|
aCounters,
|
|
aMallocSizeOf);
|
|
}
|
|
}
|
|
|
|
RawAccessFrameRef
|
|
FrameAnimator::GetRawFrame(uint32_t aFrameNum) const
|
|
{
|
|
LookupResult result =
|
|
SurfaceCache::Lookup(ImageKey(mImage),
|
|
RasterSurfaceKey(mSize,
|
|
DefaultSurfaceFlags(),
|
|
aFrameNum));
|
|
return result ? result.DrawableRef()->RawAccessRef()
|
|
: RawAccessFrameRef();
|
|
}
|
|
|
|
//******************************************************************************
|
|
// DoBlend gets called when the timer for animation get fired and we have to
|
|
// update the composited frame of the animation.
|
|
bool
|
|
FrameAnimator::DoBlend(nsIntRect* aDirtyRect,
|
|
uint32_t aPrevFrameIndex,
|
|
uint32_t aNextFrameIndex)
|
|
{
|
|
RawAccessFrameRef prevFrame = GetRawFrame(aPrevFrameIndex);
|
|
RawAccessFrameRef nextFrame = GetRawFrame(aNextFrameIndex);
|
|
|
|
MOZ_ASSERT(prevFrame && nextFrame, "Should have frames here");
|
|
|
|
AnimationData prevFrameData = prevFrame->GetAnimationData();
|
|
if (prevFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS &&
|
|
!mCompositingPrevFrame) {
|
|
prevFrameData.mDisposalMethod = DisposalMethod::CLEAR;
|
|
}
|
|
|
|
bool isFullPrevFrame = prevFrameData.mRect.x == 0 &&
|
|
prevFrameData.mRect.y == 0 &&
|
|
prevFrameData.mRect.width == mSize.width &&
|
|
prevFrameData.mRect.height == mSize.height;
|
|
|
|
// Optimization: DisposeClearAll if the previous frame is the same size as
|
|
// container and it's clearing itself
|
|
if (isFullPrevFrame &&
|
|
(prevFrameData.mDisposalMethod == DisposalMethod::CLEAR)) {
|
|
prevFrameData.mDisposalMethod = DisposalMethod::CLEAR_ALL;
|
|
}
|
|
|
|
AnimationData nextFrameData = nextFrame->GetAnimationData();
|
|
bool isFullNextFrame = nextFrameData.mRect.x == 0 &&
|
|
nextFrameData.mRect.y == 0 &&
|
|
nextFrameData.mRect.width == mSize.width &&
|
|
nextFrameData.mRect.height == mSize.height;
|
|
|
|
if (!nextFrame->GetIsPaletted()) {
|
|
// Optimization: Skip compositing if the previous frame wants to clear the
|
|
// whole image
|
|
if (prevFrameData.mDisposalMethod == DisposalMethod::CLEAR_ALL) {
|
|
aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
|
|
return true;
|
|
}
|
|
|
|
// Optimization: Skip compositing if this frame is the same size as the
|
|
// container and it's fully drawing over prev frame (no alpha)
|
|
if (isFullNextFrame &&
|
|
(nextFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS) &&
|
|
!nextFrameData.mHasAlpha) {
|
|
aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
// Calculate area that needs updating
|
|
switch (prevFrameData.mDisposalMethod) {
|
|
default:
|
|
MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
|
|
case DisposalMethod::NOT_SPECIFIED:
|
|
case DisposalMethod::KEEP:
|
|
*aDirtyRect = nextFrameData.mRect;
|
|
break;
|
|
|
|
case DisposalMethod::CLEAR_ALL:
|
|
// Whole image container is cleared
|
|
aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
|
|
break;
|
|
|
|
case DisposalMethod::CLEAR:
|
|
// Calc area that needs to be redrawn (the combination of previous and
|
|
// this frame)
|
|
// XXX - This could be done with multiple framechanged calls
|
|
// Having prevFrame way at the top of the image, and nextFrame
|
|
// way at the bottom, and both frames being small, we'd be
|
|
// telling framechanged to refresh the whole image when only two
|
|
// small areas are needed.
|
|
aDirtyRect->UnionRect(nextFrameData.mRect, prevFrameData.mRect);
|
|
break;
|
|
|
|
case DisposalMethod::RESTORE_PREVIOUS:
|
|
aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
|
|
break;
|
|
}
|
|
|
|
// Optimization:
|
|
// Skip compositing if the last composited frame is this frame
|
|
// (Only one composited frame was made for this animation. Example:
|
|
// Only Frame 3 of a 10 frame image required us to build a composite frame
|
|
// On the second loop, we do not need to rebuild the frame
|
|
// since it's still sitting in compositingFrame)
|
|
if (mLastCompositedFrameIndex == int32_t(aNextFrameIndex)) {
|
|
return true;
|
|
}
|
|
|
|
bool needToBlankComposite = false;
|
|
|
|
// Create the Compositing Frame
|
|
if (!mCompositingFrame) {
|
|
RefPtr<imgFrame> newFrame = new imgFrame;
|
|
nsresult rv = newFrame->InitForDecoder(mSize,
|
|
SurfaceFormat::B8G8R8A8);
|
|
if (NS_FAILED(rv)) {
|
|
mCompositingFrame.reset();
|
|
return false;
|
|
}
|
|
mCompositingFrame = newFrame->RawAccessRef();
|
|
needToBlankComposite = true;
|
|
} else if (int32_t(aNextFrameIndex) != mLastCompositedFrameIndex+1) {
|
|
|
|
// If we are not drawing on top of last composited frame,
|
|
// then we are building a new composite frame, so let's clear it first.
|
|
needToBlankComposite = true;
|
|
}
|
|
|
|
AnimationData compositingFrameData = mCompositingFrame->GetAnimationData();
|
|
|
|
// More optimizations possible when next frame is not transparent
|
|
// But if the next frame has DisposalMethod::RESTORE_PREVIOUS,
|
|
// this "no disposal" optimization is not possible,
|
|
// because the frame in "after disposal operation" state
|
|
// needs to be stored in compositingFrame, so it can be
|
|
// copied into compositingPrevFrame later.
|
|
bool doDisposal = true;
|
|
if (!nextFrameData.mHasAlpha &&
|
|
nextFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS) {
|
|
if (isFullNextFrame) {
|
|
// Optimization: No need to dispose prev.frame when
|
|
// next frame is full frame and not transparent.
|
|
doDisposal = false;
|
|
// No need to blank the composite frame
|
|
needToBlankComposite = false;
|
|
} else {
|
|
if ((prevFrameData.mRect.x >= nextFrameData.mRect.x) &&
|
|
(prevFrameData.mRect.y >= nextFrameData.mRect.y) &&
|
|
(prevFrameData.mRect.x + prevFrameData.mRect.width <=
|
|
nextFrameData.mRect.x + nextFrameData.mRect.width) &&
|
|
(prevFrameData.mRect.y + prevFrameData.mRect.height <=
|
|
nextFrameData.mRect.y + nextFrameData.mRect.height)) {
|
|
// Optimization: No need to dispose prev.frame when
|
|
// next frame fully overlaps previous frame.
|
|
doDisposal = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (doDisposal) {
|
|
// Dispose of previous: clear, restore, or keep (copy)
|
|
switch (prevFrameData.mDisposalMethod) {
|
|
case DisposalMethod::CLEAR:
|
|
if (needToBlankComposite) {
|
|
// If we just created the composite, it could have anything in its
|
|
// buffer. Clear whole frame
|
|
ClearFrame(compositingFrameData.mRawData,
|
|
compositingFrameData.mRect);
|
|
} else {
|
|
// Only blank out previous frame area (both color & Mask/Alpha)
|
|
ClearFrame(compositingFrameData.mRawData,
|
|
compositingFrameData.mRect,
|
|
prevFrameData.mRect);
|
|
}
|
|
break;
|
|
|
|
case DisposalMethod::CLEAR_ALL:
|
|
ClearFrame(compositingFrameData.mRawData,
|
|
compositingFrameData.mRect);
|
|
break;
|
|
|
|
case DisposalMethod::RESTORE_PREVIOUS:
|
|
// It would be better to copy only the area changed back to
|
|
// compositingFrame.
|
|
if (mCompositingPrevFrame) {
|
|
AnimationData compositingPrevFrameData =
|
|
mCompositingPrevFrame->GetAnimationData();
|
|
|
|
CopyFrameImage(compositingPrevFrameData.mRawData,
|
|
compositingPrevFrameData.mRect,
|
|
compositingFrameData.mRawData,
|
|
compositingFrameData.mRect);
|
|
|
|
// destroy only if we don't need it for this frame's disposal
|
|
if (nextFrameData.mDisposalMethod !=
|
|
DisposalMethod::RESTORE_PREVIOUS) {
|
|
mCompositingPrevFrame.reset();
|
|
}
|
|
} else {
|
|
ClearFrame(compositingFrameData.mRawData,
|
|
compositingFrameData.mRect);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
|
|
case DisposalMethod::NOT_SPECIFIED:
|
|
case DisposalMethod::KEEP:
|
|
// Copy previous frame into compositingFrame before we put the new
|
|
// frame on top
|
|
// Assumes that the previous frame represents a full frame (it could be
|
|
// smaller in size than the container, as long as the frame before it
|
|
// erased itself)
|
|
// Note: Frame 1 never gets into DoBlend(), so (aNextFrameIndex - 1)
|
|
// will always be a valid frame number.
|
|
if (mLastCompositedFrameIndex != int32_t(aNextFrameIndex - 1)) {
|
|
if (isFullPrevFrame && !prevFrame->GetIsPaletted()) {
|
|
// Just copy the bits
|
|
CopyFrameImage(prevFrameData.mRawData,
|
|
prevFrameData.mRect,
|
|
compositingFrameData.mRawData,
|
|
compositingFrameData.mRect);
|
|
} else {
|
|
if (needToBlankComposite) {
|
|
// Only blank composite when prev is transparent or not full.
|
|
if (prevFrameData.mHasAlpha || !isFullPrevFrame) {
|
|
ClearFrame(compositingFrameData.mRawData,
|
|
compositingFrameData.mRect);
|
|
}
|
|
}
|
|
DrawFrameTo(prevFrameData.mRawData, prevFrameData.mRect,
|
|
prevFrameData.mPaletteDataLength,
|
|
prevFrameData.mHasAlpha,
|
|
compositingFrameData.mRawData,
|
|
compositingFrameData.mRect,
|
|
prevFrameData.mBlendMethod);
|
|
}
|
|
}
|
|
}
|
|
} else if (needToBlankComposite) {
|
|
// If we just created the composite, it could have anything in its
|
|
// buffers. Clear them
|
|
ClearFrame(compositingFrameData.mRawData,
|
|
compositingFrameData.mRect);
|
|
}
|
|
|
|
// Check if the frame we are composing wants the previous image restored after
|
|
// it is done. Don't store it (again) if last frame wanted its image restored
|
|
// too
|
|
if ((nextFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS) &&
|
|
(prevFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS)) {
|
|
// We are storing the whole image.
|
|
// It would be better if we just stored the area that nextFrame is going to
|
|
// overwrite.
|
|
if (!mCompositingPrevFrame) {
|
|
RefPtr<imgFrame> newFrame = new imgFrame;
|
|
nsresult rv = newFrame->InitForDecoder(mSize,
|
|
SurfaceFormat::B8G8R8A8);
|
|
if (NS_FAILED(rv)) {
|
|
mCompositingPrevFrame.reset();
|
|
return false;
|
|
}
|
|
|
|
mCompositingPrevFrame = newFrame->RawAccessRef();
|
|
}
|
|
|
|
AnimationData compositingPrevFrameData =
|
|
mCompositingPrevFrame->GetAnimationData();
|
|
|
|
CopyFrameImage(compositingFrameData.mRawData,
|
|
compositingFrameData.mRect,
|
|
compositingPrevFrameData.mRawData,
|
|
compositingPrevFrameData.mRect);
|
|
|
|
mCompositingPrevFrame->Finish();
|
|
}
|
|
|
|
// blit next frame into it's correct spot
|
|
DrawFrameTo(nextFrameData.mRawData, nextFrameData.mRect,
|
|
nextFrameData.mPaletteDataLength,
|
|
nextFrameData.mHasAlpha,
|
|
compositingFrameData.mRawData,
|
|
compositingFrameData.mRect,
|
|
nextFrameData.mBlendMethod);
|
|
|
|
// Tell the image that it is fully 'downloaded'.
|
|
mCompositingFrame->Finish();
|
|
|
|
mLastCompositedFrameIndex = int32_t(aNextFrameIndex);
|
|
|
|
return true;
|
|
}
|
|
|
|
//******************************************************************************
|
|
// Fill aFrame with black. Does also clears the mask.
|
|
void
|
|
FrameAnimator::ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect)
|
|
{
|
|
if (!aFrameData) {
|
|
return;
|
|
}
|
|
|
|
memset(aFrameData, 0, aFrameRect.width * aFrameRect.height * 4);
|
|
}
|
|
|
|
//******************************************************************************
|
|
void
|
|
FrameAnimator::ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect,
|
|
const nsIntRect& aRectToClear)
|
|
{
|
|
if (!aFrameData || aFrameRect.width <= 0 || aFrameRect.height <= 0 ||
|
|
aRectToClear.width <= 0 || aRectToClear.height <= 0) {
|
|
return;
|
|
}
|
|
|
|
nsIntRect toClear = aFrameRect.Intersect(aRectToClear);
|
|
if (toClear.IsEmpty()) {
|
|
return;
|
|
}
|
|
|
|
uint32_t bytesPerRow = aFrameRect.width * 4;
|
|
for (int row = toClear.y; row < toClear.y + toClear.height; ++row) {
|
|
memset(aFrameData + toClear.x * 4 + row * bytesPerRow, 0,
|
|
toClear.width * 4);
|
|
}
|
|
}
|
|
|
|
//******************************************************************************
|
|
// Whether we succeed or fail will not cause a crash, and there's not much
|
|
// we can do about a failure, so there we don't return a nsresult
|
|
bool
|
|
FrameAnimator::CopyFrameImage(const uint8_t* aDataSrc,
|
|
const nsIntRect& aRectSrc,
|
|
uint8_t* aDataDest,
|
|
const nsIntRect& aRectDest)
|
|
{
|
|
uint32_t dataLengthSrc = aRectSrc.width * aRectSrc.height * 4;
|
|
uint32_t dataLengthDest = aRectDest.width * aRectDest.height * 4;
|
|
|
|
if (!aDataDest || !aDataSrc || dataLengthSrc != dataLengthDest) {
|
|
return false;
|
|
}
|
|
|
|
memcpy(aDataDest, aDataSrc, dataLengthDest);
|
|
|
|
return true;
|
|
}
|
|
|
|
nsresult
|
|
FrameAnimator::DrawFrameTo(const uint8_t* aSrcData, const nsIntRect& aSrcRect,
|
|
uint32_t aSrcPaletteLength, bool aSrcHasAlpha,
|
|
uint8_t* aDstPixels, const nsIntRect& aDstRect,
|
|
BlendMethod aBlendMethod)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aSrcData);
|
|
NS_ENSURE_ARG_POINTER(aDstPixels);
|
|
|
|
// According to both AGIF and APNG specs, offsets are unsigned
|
|
if (aSrcRect.x < 0 || aSrcRect.y < 0) {
|
|
NS_WARNING("FrameAnimator::DrawFrameTo: negative offsets not allowed");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
// Outside the destination frame, skip it
|
|
if ((aSrcRect.x > aDstRect.width) || (aSrcRect.y > aDstRect.height)) {
|
|
return NS_OK;
|
|
}
|
|
|
|
if (aSrcPaletteLength) {
|
|
// Larger than the destination frame, clip it
|
|
int32_t width = std::min(aSrcRect.width, aDstRect.width - aSrcRect.x);
|
|
int32_t height = std::min(aSrcRect.height, aDstRect.height - aSrcRect.y);
|
|
|
|
// The clipped image must now fully fit within destination image frame
|
|
NS_ASSERTION((aSrcRect.x >= 0) && (aSrcRect.y >= 0) &&
|
|
(aSrcRect.x + width <= aDstRect.width) &&
|
|
(aSrcRect.y + height <= aDstRect.height),
|
|
"FrameAnimator::DrawFrameTo: Invalid aSrcRect");
|
|
|
|
// clipped image size may be smaller than source, but not larger
|
|
NS_ASSERTION((width <= aSrcRect.width) && (height <= aSrcRect.height),
|
|
"FrameAnimator::DrawFrameTo: source must be smaller than dest");
|
|
|
|
// Get pointers to image data
|
|
const uint8_t* srcPixels = aSrcData + aSrcPaletteLength;
|
|
uint32_t* dstPixels = reinterpret_cast<uint32_t*>(aDstPixels);
|
|
const uint32_t* colormap = reinterpret_cast<const uint32_t*>(aSrcData);
|
|
|
|
// Skip to the right offset
|
|
dstPixels += aSrcRect.x + (aSrcRect.y * aDstRect.width);
|
|
if (!aSrcHasAlpha) {
|
|
for (int32_t r = height; r > 0; --r) {
|
|
for (int32_t c = 0; c < width; c++) {
|
|
dstPixels[c] = colormap[srcPixels[c]];
|
|
}
|
|
// Go to the next row in the source resp. destination image
|
|
srcPixels += aSrcRect.width;
|
|
dstPixels += aDstRect.width;
|
|
}
|
|
} else {
|
|
for (int32_t r = height; r > 0; --r) {
|
|
for (int32_t c = 0; c < width; c++) {
|
|
const uint32_t color = colormap[srcPixels[c]];
|
|
if (color) {
|
|
dstPixels[c] = color;
|
|
}
|
|
}
|
|
// Go to the next row in the source resp. destination image
|
|
srcPixels += aSrcRect.width;
|
|
dstPixels += aDstRect.width;
|
|
}
|
|
}
|
|
} else {
|
|
pixman_image_t* src =
|
|
pixman_image_create_bits(
|
|
aSrcHasAlpha ? PIXMAN_a8r8g8b8 : PIXMAN_x8r8g8b8,
|
|
aSrcRect.width, aSrcRect.height,
|
|
reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(aSrcData)),
|
|
aSrcRect.width * 4);
|
|
pixman_image_t* dst =
|
|
pixman_image_create_bits(PIXMAN_a8r8g8b8,
|
|
aDstRect.width,
|
|
aDstRect.height,
|
|
reinterpret_cast<uint32_t*>(aDstPixels),
|
|
aDstRect.width * 4);
|
|
|
|
auto op = aBlendMethod == BlendMethod::SOURCE ? PIXMAN_OP_SRC
|
|
: PIXMAN_OP_OVER;
|
|
pixman_image_composite32(op,
|
|
src,
|
|
nullptr,
|
|
dst,
|
|
0, 0,
|
|
0, 0,
|
|
aSrcRect.x, aSrcRect.y,
|
|
aSrcRect.width, aSrcRect.height);
|
|
|
|
pixman_image_unref(src);
|
|
pixman_image_unref(dst);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|