mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
be2de91b7f
- Bug 1211479 - Errors when parsing substituting variables should include the generated string to help diagnose the issue. r=bz (41d8876fa8)
- Bug 1219150 - EventStateManager::{LatestUserInputStart, UserInputCount};r=smaug (2420aab91f)
- Bug 1171970. Handle super-long lines in CSS files a bit more gracefully if they cause OOM when creating CSS error messages. r=heycam (c1a3ec3869)
- Bug 1226400 - null-check GetParentObject(). r=m_kato (445e4cd17b)
- Bug 1226400 - throw an error in addition to returning null. r=bz (ac11a79851)
- Bug 1222662 - In the content process, detect when the mouse exists a plugin frame and update the content cursor accordingly. r=enn (7dfa70eeaa)
- Bug 1186780: Replace EnumerateRead with new iterators in ImageLoader. r=dbaron (939ae5322c)
- Bug 1186780: ifdef DEBUG fixes on a CLOSED TREE. r=me (1d8d5cfaa1)
- Bug 1219474 - Replace PRLogModuleInfo w/ LazyLogModule in the 'image/' directory. r=seth (abd4f22cfb)
- Bug 1217571 - fix the imagelib cache to work in e10s; r=seth (25fd01a8f5)
- Bug 1187149 - Replace nsBaseHashtable::Enumerate() calls in image/ with iterators r=njn (b1f310e9cc)
- Bug 1114526 - Make sure that CSS image invalidation also notifies rendering observers even if the image isn't visible (because the rendering observers might be visible). r=mattwoodrow (1dd0d5d0f7)
- Bug 1215361 (part 1) - Don't set mBPP twice in nsICODecoder.cpp. r=seth. (8250b4e5b6)
- Bug 1215361 (part 2) - Streamline nsBMPDecoder's getters. r=seth. (dd8b3a9d61)
- Bug 1215361 (part 3) - Deconvolute nsICODecoder's handling of endianness. r=seth. (a8c0841b1b)
- Bug 1204393 (part 1) - Use StreamingLexer in the ICON decoder. r=seth. (c68d1aafe3)
- Bug 1204393 (part 2) - Add more testing of the ICON decoder. r=seth. (d964ba2aee)
- Bug 1210291 - Streamline StreamingLexer's handling of terminal states. r=seth. (92ba68ff6d)
- Bug 1223319 (part 1) - Remove unused function nsICODecoder::CalcAlphaRowSize(). r=seth. (35ddc1d85d)
- Bug 1223465 - Clamp GIF frame rects to their screen rects - r=seth (d7fbc3f591)
- Bug 1217465 - Fill in missing pixels caused by truncated BMP files. r=seth. (b18f045a48)
- Bug 1173214, r=seth,bz (fbf1b74263)
- shadow warnings in decoders (fa930afb03)
- Bug 962243 - Implement PINCH to TOUCHING transition in APZC. r=botond (937b537084)
- Add page scroll support for APZ wheel events. (bug 1228028, r=kats) (6dab10516f)
- warnings (675c4e9921)
- Bug 1153392 - Use the current timestamp if the software vsync thread is late. r=kats (4c56f24c21)
- Bug 884594 - Part 1: ACEService and nsIAccessControlEnforcer.idl. r=allstars.chh (e96c5e0bc3)
- Bug 884594 - Part 2.1: GPAccessRulesManager and nsIAccessRulesManager.idl. Add utils to SEUtils.jsm. r=allstars.chh (e299f898e9)
- Bug 884594 - Part 2.2: New SEUtils.js tests. r=allstars.chh (07a2fd9334)
- Bug 884594 - Part 3 - Build support for ACE components. r=allstars.chh (16c2cec2a6)
- Bug 884594 - Part 4: Initial integration with ACE. r=allstars.chh (38cac02a26)
- Bug 1118102 - Fix error handling by rejecting the promise request with specific SE errors instead of 'Generic Error'. r=allstars.chh r=khuey a=kwierso (a5aa5cd88b)
- var-let (9cdc34a4e3)
- Bug 1136211 - SMS cannot be sent to a 15-digit phone number (such as an iNum) which doesn't have a territory id. r=mhenretty (709e060b9e)
- Bug 1138571 - Update PhonenumberJS Metadata. r=fabrice (077024cd5a)
- Bug 1179379 - PhonenumberJS: Update Metadata. r=bent (e72bad1476)
- Bug 1136211 - SMS cannot be sent to a 15-digit phone number (such as an iNum) which doesn't have a territory id. Tests. r=mhenretty (19d12d1628)
- Bug 1188117: Do not allow IDBCursor.delete while cursor update is in progress. r=baku (86016e968f)
142 lines
3.8 KiB
C++
142 lines
3.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 {
|
|
|
|
static const uint32_t ICON_HEADER_SIZE = 2;
|
|
|
|
nsIconDecoder::nsIconDecoder(RasterImage* aImage)
|
|
: Decoder(aImage)
|
|
, mLexer(Transition::To(State::HEADER, ICON_HEADER_SIZE))
|
|
, mWidth() // set by ReadHeader()
|
|
, mHeight() // set by ReadHeader()
|
|
, mBytesPerRow() // set by ReadHeader()
|
|
, mCurrentRow(0)
|
|
{
|
|
// Nothing to do
|
|
}
|
|
|
|
nsIconDecoder::~nsIconDecoder()
|
|
{ }
|
|
|
|
void
|
|
nsIconDecoder::WriteInternal(const char* aBuffer, uint32_t aCount)
|
|
{
|
|
MOZ_ASSERT(!HasError(), "Shouldn't call WriteInternal after error!");
|
|
MOZ_ASSERT(aBuffer);
|
|
MOZ_ASSERT(aCount > 0);
|
|
|
|
Maybe<TerminalState> terminalState =
|
|
mLexer.Lex(aBuffer, aCount, [=](State aState,
|
|
const char* aData, size_t aLength) {
|
|
switch (aState) {
|
|
case State::HEADER:
|
|
return ReadHeader(aData);
|
|
case State::ROW_OF_PIXELS:
|
|
return ReadRowOfPixels(aData, aLength);
|
|
case State::FINISH:
|
|
return Finish();
|
|
default:
|
|
MOZ_CRASH("Unknown State");
|
|
}
|
|
});
|
|
|
|
if (terminalState == Some(TerminalState::FAILURE)) {
|
|
PostDataError();
|
|
}
|
|
}
|
|
|
|
LexerTransition<nsIconDecoder::State>
|
|
nsIconDecoder::ReadHeader(const char* aData)
|
|
{
|
|
// Grab the width and height.
|
|
mWidth = uint8_t(aData[0]);
|
|
mHeight = uint8_t(aData[1]);
|
|
|
|
// The input is 32bpp, so we expect 4 bytes of data per pixel.
|
|
mBytesPerRow = mWidth * 4;
|
|
|
|
// Post our size to the superclass.
|
|
PostSize(mWidth, mHeight);
|
|
|
|
// Icons have alpha.
|
|
PostHasTransparency();
|
|
|
|
// If we're doing a metadata decode, we're done.
|
|
if (IsMetadataDecode()) {
|
|
return Transition::TerminateSuccess();
|
|
}
|
|
|
|
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)) {
|
|
return Transition::TerminateFailure();
|
|
}
|
|
MOZ_ASSERT(mImageData, "Should have a buffer now");
|
|
|
|
if (mDownscaler) {
|
|
nsresult rv = mDownscaler->BeginFrame(GetSize(), Nothing(),
|
|
mImageData, /* aHasAlpha = */ true);
|
|
if (NS_FAILED(rv)) {
|
|
return Transition::TerminateFailure();
|
|
}
|
|
}
|
|
|
|
return Transition::To(State::ROW_OF_PIXELS, mBytesPerRow);
|
|
}
|
|
|
|
LexerTransition<nsIconDecoder::State>
|
|
nsIconDecoder::ReadRowOfPixels(const char* aData, size_t aLength)
|
|
{
|
|
if (mDownscaler) {
|
|
memcpy(mDownscaler->RowBuffer(), aData, mBytesPerRow);
|
|
mDownscaler->CommitRow();
|
|
|
|
if (mDownscaler->HasInvalidation()) {
|
|
DownscalerInvalidRect invalidRect = mDownscaler->TakeInvalidRect();
|
|
PostInvalidation(invalidRect.mOriginalSizeRect,
|
|
Some(invalidRect.mTargetSizeRect));
|
|
}
|
|
} else {
|
|
memcpy(mImageData + mCurrentRow * mBytesPerRow, aData, mBytesPerRow);
|
|
|
|
PostInvalidation(IntRect(0, mCurrentRow, mWidth, 1));
|
|
}
|
|
mCurrentRow++;
|
|
|
|
return (mCurrentRow < mHeight)
|
|
? Transition::To(State::ROW_OF_PIXELS, mBytesPerRow)
|
|
: Transition::To(State::FINISH, 0);
|
|
}
|
|
|
|
LexerTransition<nsIconDecoder::State>
|
|
nsIconDecoder::Finish()
|
|
{
|
|
PostFrameStop();
|
|
PostDecodeDone();
|
|
|
|
return Transition::TerminateSuccess();
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|