mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
fe3519e975
- Bug 1257611 - Fix wrong CondVar::Wait() and Monitor::Wait() usage in netwerk/cache2, r=honzab (54f1a79f43) - Bug 1239687 - Leak invalid/doomed file handles immediately after HTTP cache shutdown. r=michal (a20bcf662b) - Bug 996836 - Merge CLOSE and WRITE priority in cache2 I/O thread. r=michal (8b0af50593) - Bug 1265243 - Do not initialize CacheObserver in the child process, r=honzab (87f69529d2) - Bug 1247432 - Don't do any unnecessary I/O in cache2 after shutdown. r=michal (7c5a2b89ac) - Bug 1220272 - Fix signalling in HTTP cache test code suspender. r=michal (293a16731d) - Bug 1160368 - Part 2: Clean up some cruft in nsCookie.h from PRBool/bool conversions. r=jdm (aa873f2dcc) - Bug 1160368 - Part 5: Clean up some confusing browser_storage_listings.js checks. r=jdm (b27f5930a9) - Bug 866380 - Null check for amlogic libc implementation. r=valentin (c3a487af9c) - Bug 1257320 - Disable C4577 to unblock compilation on VS2015; r=mayhemer (2f800ca85c) - Bug 1229726 - fix the data copy from sockaddr to NetAddr on OSX/FreeBSD. r=mcmanus. (fde11e004e) - Bug 1241368 - provide JS implemented MDNS service as a fallback. r=nwgh,nalexander. (afe1445eb8) - Bug 571126: Remove NECKO_SEPARATE_STACKS support, r=jduell (fb5b87bb3a) - Bug 1057689 - Add xpcshell test checking correct notifications and app-offline state r=jduell (89946b44ba) - Bug 1259459 - h2 0 length options puts end-stream on headers r=hurley (618480a609) - Bug 1234251 - Remove HttpChannelChild::mSynthesizedResponseHead; r=jdm (20981affea) - Bug 904559 - Veto redirect when target channel doesn't implement nsIParentRedirectingChannel. r=jduell (b3da2fae91) - Bug 1261784 Make sure InterceptedChannel body streams are always closed. r=jdm (cd50b1a52b) - Bug 1224508 - Use URI path without reference as the callback key. r=valentin. (b8a953f23a) - Bug 1226760 - ViewSource doesn't work for packaged app resources r=mcmanus (ec9b0297de) - Bug 1254061 - Rewrite nsHttp::ParseInt64 using strtoll r=mcmanus (2125b8ae6f) - Bug 1241565 - nsIHttpChannelInternal should be a builtinclass, r=honzab.moz (d24da6a95a) - Bug 1252386 - Removed debugging printf,r=me (c5d89f353c) - bug 277813 - autogenerated expires needs max r=mayhemer (6aa7c255a5) - Bug 1225384 - Change how the default resource "host names" are handled. r=michal (868732baab) - Bug 719905: Fix resolution of resource: URLs containing : and / characters. r=valentin (f60f4baacf) - Bug 1195173 - Convert ExtensionProtocolHandler to use channel->Open2() (r=maglione) (063f5d5d10) - Bug 1226909 followup to fix bustage. Make sure that the channel returned by NS_NewChannel doesn't have a loadinfo that indicates that the channel has already been opened (42ebe0f44e) - Bug 241698 - Fixed init and use of nsDirIndex::mLastModified (-1LL) + built in nullptr checks where they were missing. r=dragana (e9c2277a3d) - Bug 1261318 - make sure brotli context is created in onstoprequest r=bagder (6646fed64d) - Bug 1212223 - Update |bufLen| as well when we probed the multipart preamble. r=valentin. (ec878c5b0f) - Bug 1259561: Increase CRAZY_COORD (threshold for debug build layout warnings) by an order of magnitude. r=mats (c05c16dd85) - Bug 1261698. Make ReparentFrameViewTo return void because it always returns NS_OK. r=mats (e806d6abcb) - Bug 1261698. Remove comment that is not relevant in nsContainerFrame.cpp. (f570189d15) - Bug 1261698. Don't descend into child frames looking for views in ReparentFrameViewTo if the frame doesn't have the NS_FRAME_HAS_CHILD_WITH_VIEW bit set. r=mats (0d42befd46) - Bug 1265154 - Fix compile error in MSVC 2013 caused by ArrayLength; r=heycam (1c962f2840) - Bug 1260351 - Image: Enable ConvolveVertically/Horizontally in LS3 MMI. r=tnikkel (576b6bbdb3) - Bug 1209780 (Part 1) - Mark DrawResult MOZ_MUST_USE. r=tn (e6c113bef2) - Bug 1253753 - Remove unnecessary switch fallthrough to avoid -Wimplicit-fallthrough warning. r=karlt (96bd93fc5c) - bug 1260178 null check pattern from -unico-border-gradient r=acomminos (f63c9c7ffb) - Bug 1247796. Use keyboardFocusIndicatorColor for ActiveBorder system color keyword. r=mstange (7ed133de97) - Bug 1248675 - Update the cached mBounds in nsChildView when its backing scale factor (display DPI) changes. r=mstange (8197274118) - Bug 1256576 - Make sure texture is (re)initialized if the size changed. r=snorp (2c56790ca9) - Bug 1242449 - Fix confusion among CSS, desktop and device pixel units in nsXULWindow position/size and window staggering so as to work consistently across mixed resolution displays. r=emk (f73d2fd41d) - Bug 1255645 - Ensure nsXULWindow constrains the window to the bounds of its screen after applying intrinsic sizing (if appropriate), by re-doing positioning after the window has been sized properly. r=emk (e87e0cea81) - Bug 1259492 - Ensure window position is constrained to the screen after it has been sized properly in nsXULWindow::OnChromeLoaded. r=emk (7cf599b39b) - Bug 1832708 - Disable std::__throw_* wrapping on libc++ >= 14.0. r=firefox-build-system-reviewers,andi (29e0cc9319)
349 lines
11 KiB
C++
349 lines
11 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 "Downscaler.h"
|
|
|
|
#include <algorithm>
|
|
#include <ctime>
|
|
#include "gfxPrefs.h"
|
|
#include "image_operations.h"
|
|
#include "mozilla/SSE.h"
|
|
#include "mozilla/mips.h"
|
|
#include "convolver.h"
|
|
#include "skia/include/core/SkTypes.h"
|
|
|
|
using std::max;
|
|
using std::swap;
|
|
|
|
namespace mozilla {
|
|
namespace image {
|
|
|
|
Downscaler::Downscaler(const nsIntSize& aTargetSize)
|
|
: mTargetSize(aTargetSize)
|
|
, mOutputBuffer(nullptr)
|
|
, mXFilter(MakeUnique<skia::ConvolutionFilter1D>())
|
|
, mYFilter(MakeUnique<skia::ConvolutionFilter1D>())
|
|
, mWindowCapacity(0)
|
|
, mHasAlpha(true)
|
|
, mFlipVertically(false)
|
|
{
|
|
MOZ_ASSERT(gfxPrefs::ImageDownscaleDuringDecodeEnabled(),
|
|
"Downscaling even though downscale-during-decode is disabled?");
|
|
MOZ_ASSERT(mTargetSize.width > 0 && mTargetSize.height > 0,
|
|
"Invalid target size");
|
|
}
|
|
|
|
Downscaler::~Downscaler()
|
|
{
|
|
ReleaseWindow();
|
|
}
|
|
|
|
void
|
|
Downscaler::ReleaseWindow()
|
|
{
|
|
if (!mWindow) {
|
|
return;
|
|
}
|
|
|
|
for (int32_t i = 0; i < mWindowCapacity; ++i) {
|
|
delete[] mWindow[i];
|
|
}
|
|
|
|
mWindow = nullptr;
|
|
mWindowCapacity = 0;
|
|
}
|
|
|
|
nsresult
|
|
Downscaler::BeginFrame(const nsIntSize& aOriginalSize,
|
|
const Maybe<nsIntRect>& aFrameRect,
|
|
uint8_t* aOutputBuffer,
|
|
bool aHasAlpha,
|
|
bool aFlipVertically /* = false */)
|
|
{
|
|
MOZ_ASSERT(aOutputBuffer);
|
|
MOZ_ASSERT(mTargetSize != aOriginalSize,
|
|
"Created a downscaler, but not downscaling?");
|
|
MOZ_ASSERT(mTargetSize.width <= aOriginalSize.width,
|
|
"Created a downscaler, but width is larger");
|
|
MOZ_ASSERT(mTargetSize.height <= aOriginalSize.height,
|
|
"Created a downscaler, but height is larger");
|
|
MOZ_ASSERT(aOriginalSize.width > 0 && aOriginalSize.height > 0,
|
|
"Invalid original size");
|
|
|
|
// Only downscale from reasonable sizes to avoid using too much memory/cpu
|
|
// downscaling and decoding. 1 << 20 == 1,048,576 seems a reasonable limit.
|
|
if (aOriginalSize.width > (1 << 20) || aOriginalSize.height > (1 << 20)) {
|
|
NS_WARNING("Trying to downscale image frame that is too large");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
mFrameRect = aFrameRect.valueOr(nsIntRect(nsIntPoint(), aOriginalSize));
|
|
MOZ_ASSERT(mFrameRect.x >= 0 && mFrameRect.y >= 0 &&
|
|
mFrameRect.width >= 0 && mFrameRect.height >= 0,
|
|
"Frame rect must have non-negative components");
|
|
MOZ_ASSERT(nsIntRect(0, 0, aOriginalSize.width, aOriginalSize.height)
|
|
.Contains(mFrameRect),
|
|
"Frame rect must fit inside image");
|
|
MOZ_ASSERT_IF(!nsIntRect(0, 0, aOriginalSize.width, aOriginalSize.height)
|
|
.IsEqualEdges(mFrameRect),
|
|
aHasAlpha);
|
|
|
|
mOriginalSize = aOriginalSize;
|
|
mScale = gfxSize(double(mOriginalSize.width) / mTargetSize.width,
|
|
double(mOriginalSize.height) / mTargetSize.height);
|
|
mOutputBuffer = aOutputBuffer;
|
|
mHasAlpha = aHasAlpha;
|
|
mFlipVertically = aFlipVertically;
|
|
|
|
ReleaseWindow();
|
|
|
|
auto resizeMethod = skia::ImageOperations::RESIZE_LANCZOS3;
|
|
|
|
skia::resize::ComputeFilters(resizeMethod,
|
|
mOriginalSize.width, mTargetSize.width,
|
|
0, mTargetSize.width,
|
|
mXFilter.get());
|
|
|
|
if (mXFilter->max_filter() <= 0 || mXFilter->num_values() != mTargetSize.width) {
|
|
NS_WARNING("Failed to compute filters for image downscaling");
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
skia::resize::ComputeFilters(resizeMethod,
|
|
mOriginalSize.height, mTargetSize.height,
|
|
0, mTargetSize.height,
|
|
mYFilter.get());
|
|
|
|
if (mYFilter->max_filter() <= 0 || mYFilter->num_values() != mTargetSize.height) {
|
|
NS_WARNING("Failed to compute filters for image downscaling");
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
// Allocate the buffer, which contains scanlines of the original image.
|
|
// pad by 15 to handle overreads by the simd code
|
|
size_t bufferLen = mOriginalSize.width * sizeof(uint32_t) + 15;
|
|
mRowBuffer.reset(new (fallible) uint8_t[bufferLen]);
|
|
if (MOZ_UNLIKELY(!mRowBuffer)) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
// Zero buffer to keep valgrind happy.
|
|
memset(mRowBuffer.get(), 0, bufferLen);
|
|
|
|
// Allocate the window, which contains horizontally downscaled scanlines. (We
|
|
// can store scanlines which are already downscale because our downscaling
|
|
// filter is separable.)
|
|
mWindowCapacity = mYFilter->max_filter();
|
|
mWindow.reset(new (fallible) uint8_t*[mWindowCapacity]);
|
|
if (MOZ_UNLIKELY(!mWindow)) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
bool anyAllocationFailed = false;
|
|
// pad by 15 to handle overreads by the simd code
|
|
const int rowSize = mTargetSize.width * sizeof(uint32_t) + 15;
|
|
for (int32_t i = 0; i < mWindowCapacity; ++i) {
|
|
mWindow[i] = new (fallible) uint8_t[rowSize];
|
|
anyAllocationFailed = anyAllocationFailed || mWindow[i] == nullptr;
|
|
}
|
|
|
|
if (MOZ_UNLIKELY(anyAllocationFailed)) {
|
|
// We intentionally iterate through the entire array even if an allocation
|
|
// fails, to ensure that all the pointers in it are either valid or nullptr.
|
|
// That in turn ensures that ReleaseWindow() can clean up correctly.
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
ResetForNextProgressivePass();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
Downscaler::SkipToRow(int32_t aRow)
|
|
{
|
|
if (mCurrentInLine < aRow) {
|
|
ClearRow();
|
|
do {
|
|
CommitRow();
|
|
} while (mCurrentInLine < aRow);
|
|
}
|
|
}
|
|
|
|
void
|
|
Downscaler::ResetForNextProgressivePass()
|
|
{
|
|
mPrevInvalidatedLine = 0;
|
|
mCurrentOutLine = 0;
|
|
mCurrentInLine = 0;
|
|
mLinesInBuffer = 0;
|
|
|
|
if (mFrameRect.IsEmpty()) {
|
|
// Our frame rect is zero size; commit rows until the end of the image.
|
|
SkipToRow(mOriginalSize.height - 1);
|
|
} else {
|
|
// If we have a vertical offset, commit rows to shift us past it.
|
|
SkipToRow(mFrameRect.y);
|
|
}
|
|
}
|
|
|
|
static void
|
|
GetFilterOffsetAndLength(UniquePtr<skia::ConvolutionFilter1D>& aFilter,
|
|
int32_t aOutputImagePosition,
|
|
int32_t* aFilterOffsetOut,
|
|
int32_t* aFilterLengthOut)
|
|
{
|
|
MOZ_ASSERT(aOutputImagePosition < aFilter->num_values());
|
|
aFilter->FilterForValue(aOutputImagePosition,
|
|
aFilterOffsetOut,
|
|
aFilterLengthOut);
|
|
}
|
|
|
|
void
|
|
Downscaler::ClearRestOfRow(uint32_t aStartingAtCol)
|
|
{
|
|
MOZ_ASSERT(int64_t(aStartingAtCol) <= int64_t(mOriginalSize.width));
|
|
uint32_t bytesToClear = (mOriginalSize.width - aStartingAtCol)
|
|
* sizeof(uint32_t);
|
|
memset(mRowBuffer.get() + (aStartingAtCol * sizeof(uint32_t)),
|
|
0, bytesToClear);
|
|
}
|
|
|
|
void
|
|
Downscaler::CommitRow()
|
|
{
|
|
MOZ_ASSERT(mOutputBuffer, "Should have a current frame");
|
|
MOZ_ASSERT(mCurrentInLine < mOriginalSize.height, "Past end of input");
|
|
|
|
if (mCurrentOutLine < mTargetSize.height) {
|
|
int32_t filterOffset = 0;
|
|
int32_t filterLength = 0;
|
|
GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
|
|
&filterOffset, &filterLength);
|
|
|
|
int32_t inLineToRead = filterOffset + mLinesInBuffer;
|
|
MOZ_ASSERT(mCurrentInLine <= inLineToRead, "Reading past end of input");
|
|
if (mCurrentInLine == inLineToRead) {
|
|
skia::ConvolveHorizontally(mRowBuffer.get(), *mXFilter,
|
|
mWindow[mLinesInBuffer++], mHasAlpha,
|
|
supports_sse2() || supports_mmi());
|
|
}
|
|
|
|
MOZ_ASSERT(mCurrentOutLine < mTargetSize.height,
|
|
"Writing past end of output");
|
|
|
|
while (mLinesInBuffer == filterLength) {
|
|
DownscaleInputLine();
|
|
|
|
if (mCurrentOutLine == mTargetSize.height) {
|
|
break; // We're done.
|
|
}
|
|
|
|
GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
|
|
&filterOffset, &filterLength);
|
|
}
|
|
}
|
|
|
|
mCurrentInLine += 1;
|
|
|
|
// If we're at the end of the part of the original image that has data, commit
|
|
// rows to shift us to the end.
|
|
if (mCurrentInLine == (mFrameRect.y + mFrameRect.height)) {
|
|
SkipToRow(mOriginalSize.height - 1);
|
|
}
|
|
}
|
|
|
|
bool
|
|
Downscaler::HasInvalidation() const
|
|
{
|
|
return mCurrentOutLine > mPrevInvalidatedLine;
|
|
}
|
|
|
|
DownscalerInvalidRect
|
|
Downscaler::TakeInvalidRect()
|
|
{
|
|
if (MOZ_UNLIKELY(!HasInvalidation())) {
|
|
return DownscalerInvalidRect();
|
|
}
|
|
|
|
DownscalerInvalidRect invalidRect;
|
|
|
|
// Compute the target size invalid rect.
|
|
if (mFlipVertically) {
|
|
// We need to flip it. This will implicitly flip the original size invalid
|
|
// rect, since we compute it by scaling this rect.
|
|
invalidRect.mTargetSizeRect =
|
|
IntRect(0, mTargetSize.height - mCurrentOutLine,
|
|
mTargetSize.width, mCurrentOutLine - mPrevInvalidatedLine);
|
|
} else {
|
|
invalidRect.mTargetSizeRect =
|
|
IntRect(0, mPrevInvalidatedLine,
|
|
mTargetSize.width, mCurrentOutLine - mPrevInvalidatedLine);
|
|
}
|
|
|
|
mPrevInvalidatedLine = mCurrentOutLine;
|
|
|
|
// Compute the original size invalid rect.
|
|
invalidRect.mOriginalSizeRect = invalidRect.mTargetSizeRect;
|
|
invalidRect.mOriginalSizeRect.ScaleRoundOut(mScale.width, mScale.height);
|
|
|
|
return invalidRect;
|
|
}
|
|
|
|
void
|
|
Downscaler::DownscaleInputLine()
|
|
{
|
|
typedef skia::ConvolutionFilter1D::Fixed FilterValue;
|
|
|
|
MOZ_ASSERT(mOutputBuffer);
|
|
MOZ_ASSERT(mCurrentOutLine < mTargetSize.height,
|
|
"Writing past end of output");
|
|
|
|
int32_t filterOffset = 0;
|
|
int32_t filterLength = 0;
|
|
MOZ_ASSERT(mCurrentOutLine < mYFilter->num_values());
|
|
auto filterValues =
|
|
mYFilter->FilterForValue(mCurrentOutLine, &filterOffset, &filterLength);
|
|
|
|
int32_t currentOutLine = mFlipVertically
|
|
? mTargetSize.height - (mCurrentOutLine + 1)
|
|
: mCurrentOutLine;
|
|
MOZ_ASSERT(currentOutLine >= 0);
|
|
|
|
uint8_t* outputLine =
|
|
&mOutputBuffer[currentOutLine * mTargetSize.width * sizeof(uint32_t)];
|
|
skia::ConvolveVertically(static_cast<const FilterValue*>(filterValues),
|
|
filterLength, mWindow.get(), mXFilter->num_values(),
|
|
outputLine, mHasAlpha, supports_sse2() || supports_mmi());
|
|
|
|
mCurrentOutLine += 1;
|
|
|
|
if (mCurrentOutLine == mTargetSize.height) {
|
|
// We're done.
|
|
return;
|
|
}
|
|
|
|
int32_t newFilterOffset = 0;
|
|
int32_t newFilterLength = 0;
|
|
GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
|
|
&newFilterOffset, &newFilterLength);
|
|
|
|
int diff = newFilterOffset - filterOffset;
|
|
MOZ_ASSERT(diff >= 0, "Moving backwards in the filter?");
|
|
|
|
// Shift the buffer. We're just moving pointers here, so this is cheap.
|
|
mLinesInBuffer -= diff;
|
|
mLinesInBuffer = max(mLinesInBuffer, 0);
|
|
for (int32_t i = 0; i < mLinesInBuffer; ++i) {
|
|
swap(mWindow[i], mWindow[filterLength - mLinesInBuffer + i]);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|