mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +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)
187 lines
5.2 KiB
C++
187 lines
5.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 "nsIconDecoder.h"
|
|
#include "nsIInputStream.h"
|
|
#include "nspr.h"
|
|
#include "nsRect.h"
|
|
#include "nsError.h"
|
|
#include "RasterImage.h"
|
|
#include <algorithm>
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
using std::min;
|
|
|
|
namespace mozilla {
|
|
namespace image {
|
|
|
|
nsIconDecoder::nsIconDecoder(RasterImage* aImage)
|
|
: Decoder(aImage)
|
|
, mExpectedDataLength(0)
|
|
, mPixBytesRead(0)
|
|
, mState(iconStateStart)
|
|
, mWidth(-1)
|
|
, mHeight(-1)
|
|
{
|
|
// Nothing to do
|
|
}
|
|
|
|
nsIconDecoder::~nsIconDecoder()
|
|
{ }
|
|
|
|
void
|
|
nsIconDecoder::WriteInternal(const char* aBuffer, uint32_t aCount)
|
|
{
|
|
MOZ_ASSERT(!HasError(), "Shouldn't call WriteInternal after error!");
|
|
|
|
// Loop until the input data is gone
|
|
while (aCount > 0) {
|
|
switch (mState) {
|
|
case iconStateStart:
|
|
|
|
// Grab the width
|
|
mWidth = (uint8_t)*aBuffer;
|
|
|
|
// Book Keeping
|
|
aBuffer++;
|
|
aCount--;
|
|
mState = iconStateHaveHeight;
|
|
break;
|
|
|
|
case iconStateHaveHeight:
|
|
|
|
// Grab the Height
|
|
mHeight = (uint8_t)*aBuffer;
|
|
|
|
// Post our size to the superclass
|
|
PostSize(mWidth, mHeight);
|
|
|
|
PostHasTransparency();
|
|
|
|
if (HasError()) {
|
|
// Setting the size led to an error.
|
|
mState = iconStateFinished;
|
|
return;
|
|
}
|
|
|
|
// If we're doing a metadata decode, we're done.
|
|
if (IsMetadataDecode()) {
|
|
mState = iconStateFinished;
|
|
break;
|
|
}
|
|
|
|
// The input is 32bpp, so we expect 4 bytes of data per pixel.
|
|
mExpectedDataLength = mWidth * mHeight * 4;
|
|
|
|
{
|
|
MOZ_ASSERT(!mImageData, "Already have a buffer allocated?");
|
|
IntSize targetSize = mDownscaler ? mDownscaler->TargetSize()
|
|
: GetSize();
|
|
nsresult rv = AllocateFrame(0, targetSize,
|
|
IntRect(IntPoint(), targetSize),
|
|
gfx::SurfaceFormat::B8G8R8A8);
|
|
if (NS_FAILED(rv)) {
|
|
mState = iconStateFinished;
|
|
return;
|
|
}
|
|
}
|
|
|
|
MOZ_ASSERT(mImageData, "Should have a buffer now");
|
|
|
|
if (mDownscaler) {
|
|
nsresult rv = mDownscaler->BeginFrame(GetSize(),
|
|
mImageData,
|
|
/* aHasAlpha = */ true);
|
|
if (NS_FAILED(rv)) {
|
|
mState = iconStateFinished;
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Book Keeping
|
|
aBuffer++;
|
|
aCount--;
|
|
mState = iconStateReadPixels;
|
|
break;
|
|
|
|
case iconStateReadPixels: {
|
|
|
|
// How many bytes are we reading?
|
|
uint32_t bytesToRead = min(aCount, mExpectedDataLength - mPixBytesRead);
|
|
|
|
if (mDownscaler) {
|
|
uint8_t* row = mDownscaler->RowBuffer();
|
|
const uint32_t bytesPerRow = mWidth * 4;
|
|
const uint32_t rowOffset = mPixBytesRead % bytesPerRow;
|
|
|
|
// Update global state; we're about to read |bytesToRead| bytes.
|
|
aCount -= bytesToRead;
|
|
mPixBytesRead += bytesToRead;
|
|
|
|
if (rowOffset > 0) {
|
|
// Finish the current row.
|
|
const uint32_t remaining = bytesPerRow - rowOffset;
|
|
memcpy(row + rowOffset, aBuffer, remaining);
|
|
aBuffer += remaining;
|
|
bytesToRead -= remaining;
|
|
mDownscaler->CommitRow();
|
|
}
|
|
|
|
// Copy the bytes a row at a time.
|
|
while (bytesToRead > bytesPerRow) {
|
|
memcpy(row, aBuffer, bytesPerRow);
|
|
aBuffer += bytesPerRow;
|
|
bytesToRead -= bytesPerRow;
|
|
mDownscaler->CommitRow();
|
|
}
|
|
|
|
// Copy any leftover bytes. (Leaving the current row incomplete.)
|
|
if (bytesToRead > 0) {
|
|
memcpy(row, aBuffer, bytesToRead);
|
|
aBuffer += bytesPerRow;
|
|
bytesToRead -= bytesPerRow;
|
|
}
|
|
|
|
if (mDownscaler->HasInvalidation()) {
|
|
DownscalerInvalidRect invalidRect = mDownscaler->TakeInvalidRect();
|
|
PostInvalidation(invalidRect.mOriginalSizeRect,
|
|
Some(invalidRect.mTargetSizeRect));
|
|
}
|
|
} else {
|
|
// Copy all the bytes at once.
|
|
memcpy(mImageData + mPixBytesRead, aBuffer, bytesToRead);
|
|
aBuffer += bytesToRead;
|
|
aCount -= bytesToRead;
|
|
mPixBytesRead += bytesToRead;
|
|
|
|
// Invalidate. Performance isn't critical here, so our update
|
|
// rectangle is always the full icon.
|
|
PostInvalidation(IntRect(0, 0, mWidth, mHeight));
|
|
}
|
|
|
|
// If we've got all the pixel bytes, we're finished
|
|
if (mPixBytesRead == mExpectedDataLength) {
|
|
PostFrameStop();
|
|
PostDecodeDone();
|
|
mState = iconStateFinished;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case iconStateFinished:
|
|
|
|
// Consume all excess data silently
|
|
aCount = 0;
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|