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)
383 lines
12 KiB
C++
383 lines
12 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/. */
|
|
|
|
/**
|
|
* DownscalingSurfaceFilter is a SurfaceFilter implementation for use with
|
|
* SurfacePipe which performs Lanczos downscaling.
|
|
*
|
|
* It's in this header file, separated from the other SurfaceFilters, because
|
|
* some preprocessor magic is necessary to ensure that there aren't compilation
|
|
* issues on platforms where Skia is unavailable.
|
|
*/
|
|
|
|
#ifndef mozilla_image_DownscalingFilter_h
|
|
#define mozilla_image_DownscalingFilter_h
|
|
|
|
#include <algorithm>
|
|
#include <ctime>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
#include "mozilla/Maybe.h"
|
|
#include "mozilla/SSE.h"
|
|
#include "mozilla/mips.h"
|
|
#include "mozilla/UniquePtr.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "gfxPrefs.h"
|
|
|
|
#ifdef MOZ_ENABLE_SKIA
|
|
#include "convolver.h"
|
|
#include "image_operations.h"
|
|
#include "skia/include/core/SkTypes.h"
|
|
#endif
|
|
|
|
#include "SurfacePipe.h"
|
|
|
|
namespace mozilla {
|
|
namespace image {
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
// DownscalingFilter
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
template <typename Next> class DownscalingFilter;
|
|
|
|
/**
|
|
* A configuration struct for DownscalingConfig.
|
|
*/
|
|
struct DownscalingConfig
|
|
{
|
|
template <typename Next> using Filter = DownscalingFilter<Next>;
|
|
gfx::IntSize mInputSize; /// The size of the input image. We'll downscale
|
|
/// from this size to the input size of the next
|
|
/// SurfaceFilter in the chain.
|
|
gfx::SurfaceFormat mFormat; /// The pixel format - BGRA or BGRX. (BGRX has
|
|
/// slightly better performance.)
|
|
};
|
|
|
|
#ifndef MOZ_ENABLE_SKIA
|
|
|
|
/**
|
|
* DownscalingFilter requires Skia. This is a fallback implementation for
|
|
* non-Skia builds that fails when Configure() is called (which will prevent
|
|
* SurfacePipeFactory from returning an instance of it) and crashes if a caller
|
|
* manually constructs an instance and attempts to actually use it. Callers
|
|
* should avoid this by ensuring that they do not request downscaling in
|
|
* non-Skia builds.
|
|
*/
|
|
template <typename Next>
|
|
class DownscalingFilter final : public SurfaceFilter
|
|
{
|
|
public:
|
|
uint8_t* AdvanceRow() override { MOZ_CRASH(); return nullptr; }
|
|
Maybe<SurfaceInvalidRect> TakeInvalidRect() override { return Nothing(); }
|
|
|
|
template <typename... Rest>
|
|
nsresult Configure(const DownscalingConfig& aConfig, Rest... aRest)
|
|
{
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
protected:
|
|
uint8_t* DoResetToFirstRow() override { MOZ_CRASH(); return nullptr; }
|
|
};
|
|
|
|
#else
|
|
|
|
/**
|
|
* DownscalingFilter performs Lanczos downscaling, taking image input data at one size
|
|
* and outputting it rescaled to a different size.
|
|
*
|
|
* The 'Next' template parameter specifies the next filter in the chain.
|
|
*/
|
|
template <typename Next>
|
|
class DownscalingFilter final : public SurfaceFilter
|
|
{
|
|
public:
|
|
DownscalingFilter()
|
|
: mXFilter(MakeUnique<skia::ConvolutionFilter1D>())
|
|
, mYFilter(MakeUnique<skia::ConvolutionFilter1D>())
|
|
, mWindowCapacity(0)
|
|
, mRowsInWindow(0)
|
|
, mInputRow(0)
|
|
, mOutputRow(0)
|
|
, mHasAlpha(true)
|
|
{
|
|
MOZ_ASSERT(gfxPrefs::ImageDownscaleDuringDecodeEnabled(),
|
|
"Downscaling even though downscale-during-decode is disabled?");
|
|
}
|
|
|
|
~DownscalingFilter()
|
|
{
|
|
ReleaseWindow();
|
|
}
|
|
|
|
template <typename... Rest>
|
|
nsresult Configure(const DownscalingConfig& aConfig, Rest... aRest)
|
|
{
|
|
nsresult rv = mNext.Configure(aRest...);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
if (mNext.IsValidPalettedPipe()) {
|
|
NS_WARNING("Created a downscaler for a paletted surface?");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
if (mNext.InputSize() == aConfig.mInputSize) {
|
|
NS_WARNING("Created a downscaler, but not downscaling?");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
if (mNext.InputSize().width > aConfig.mInputSize.width) {
|
|
NS_WARNING("Created a downscaler, but width is larger");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
if (mNext.InputSize().height > aConfig.mInputSize.height) {
|
|
NS_WARNING("Created a downscaler, but height is larger");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
if (aConfig.mInputSize.width <= 0 || aConfig.mInputSize.height <= 0) {
|
|
NS_WARNING("Invalid input size for DownscalingFilter");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
mInputSize = aConfig.mInputSize;
|
|
gfx::IntSize outputSize = mNext.InputSize();
|
|
mScale = gfxSize(double(mInputSize.width) / outputSize.width,
|
|
double(mInputSize.height) / outputSize.height);
|
|
mHasAlpha = aConfig.mFormat == gfx::SurfaceFormat::B8G8R8A8;
|
|
|
|
ReleaseWindow();
|
|
|
|
auto resizeMethod = skia::ImageOperations::RESIZE_LANCZOS3;
|
|
|
|
skia::resize::ComputeFilters(resizeMethod,
|
|
mInputSize.width, outputSize.width,
|
|
0, outputSize.width,
|
|
mXFilter.get());
|
|
|
|
skia::resize::ComputeFilters(resizeMethod,
|
|
mInputSize.height, outputSize.height,
|
|
0, outputSize.height,
|
|
mYFilter.get());
|
|
|
|
// Allocate the buffer, which contains scanlines of the input image.
|
|
mRowBuffer.reset(new (fallible)
|
|
uint8_t[PaddedWidthInBytes(mInputSize.width)]);
|
|
if (MOZ_UNLIKELY(!mRowBuffer)) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
// Clear the buffer to avoid writing uninitialized memory to the output.
|
|
memset(mRowBuffer.get(), 0, PaddedWidthInBytes(mInputSize.width));
|
|
|
|
// Allocate the window, which contains horizontally downscaled scanlines. (We
|
|
// can store scanlines which are already downscaled 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;
|
|
}
|
|
|
|
// Allocate the "window" of recent rows that we keep in memory as input for
|
|
// the downscaling code. 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.
|
|
bool anyAllocationFailed = false;
|
|
const uint32_t windowRowSizeInBytes = PaddedWidthInBytes(outputSize.width);
|
|
for (int32_t i = 0; i < mWindowCapacity; ++i) {
|
|
mWindow[i] = new (fallible) uint8_t[windowRowSizeInBytes];
|
|
anyAllocationFailed = anyAllocationFailed || mWindow[i] == nullptr;
|
|
}
|
|
|
|
if (MOZ_UNLIKELY(anyAllocationFailed)) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
ConfigureFilter(mInputSize, sizeof(uint32_t));
|
|
return NS_OK;
|
|
}
|
|
|
|
Maybe<SurfaceInvalidRect> TakeInvalidRect() override
|
|
{
|
|
Maybe<SurfaceInvalidRect> invalidRect = mNext.TakeInvalidRect();
|
|
|
|
if (invalidRect) {
|
|
// Compute the input space invalid rect by scaling.
|
|
invalidRect->mInputSpaceRect.ScaleRoundOut(mScale.width, mScale.height);
|
|
}
|
|
|
|
return invalidRect;
|
|
}
|
|
|
|
uint8_t* AdvanceRow() override
|
|
{
|
|
if (mInputRow >= mInputSize.height) {
|
|
NS_WARNING("Advancing DownscalingFilter past the end of the input");
|
|
return nullptr;
|
|
}
|
|
|
|
if (mOutputRow >= mNext.InputSize().height) {
|
|
NS_WARNING("Advancing DownscalingFilter past the end of the output");
|
|
return nullptr;
|
|
}
|
|
|
|
int32_t filterOffset = 0;
|
|
int32_t filterLength = 0;
|
|
GetFilterOffsetAndLength(mYFilter, mOutputRow,
|
|
&filterOffset, &filterLength);
|
|
|
|
int32_t inputRowToRead = filterOffset + mRowsInWindow;
|
|
MOZ_ASSERT(mInputRow <= inputRowToRead, "Reading past end of input");
|
|
if (mInputRow == inputRowToRead) {
|
|
skia::ConvolveHorizontally(mRowBuffer.get(), *mXFilter,
|
|
mWindow[mRowsInWindow++], mHasAlpha,
|
|
supports_sse2() || supports_mmi());
|
|
}
|
|
|
|
MOZ_ASSERT(mOutputRow < mNext.InputSize().height,
|
|
"Writing past end of output");
|
|
|
|
while (mRowsInWindow == filterLength) {
|
|
DownscaleInputRow();
|
|
|
|
if (mOutputRow == mNext.InputSize().height) {
|
|
break; // We're done.
|
|
}
|
|
|
|
GetFilterOffsetAndLength(mYFilter, mOutputRow,
|
|
&filterOffset, &filterLength);
|
|
}
|
|
|
|
mInputRow++;
|
|
|
|
return mInputRow < mInputSize.height ? GetRowPointer()
|
|
: nullptr;
|
|
}
|
|
|
|
protected:
|
|
uint8_t* DoResetToFirstRow() override
|
|
{
|
|
mNext.ResetToFirstRow();
|
|
|
|
mInputRow = 0;
|
|
mOutputRow = 0;
|
|
mRowsInWindow = 0;
|
|
|
|
return GetRowPointer();
|
|
}
|
|
|
|
private:
|
|
uint8_t* GetRowPointer() const { return mRowBuffer.get(); }
|
|
|
|
static uint32_t PaddedWidthInBytes(uint32_t aLogicalWidth)
|
|
{
|
|
// Convert from width in BGRA/BGRX pixels to width in bytes, padding by 15
|
|
// to handle overreads by the SIMD code inside Skia.
|
|
return aLogicalWidth * sizeof(uint32_t) + 15;
|
|
}
|
|
|
|
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 DownscaleInputRow()
|
|
{
|
|
typedef skia::ConvolutionFilter1D::Fixed FilterValue;
|
|
|
|
MOZ_ASSERT(mOutputRow < mNext.InputSize().height,
|
|
"Writing past end of output");
|
|
|
|
int32_t filterOffset = 0;
|
|
int32_t filterLength = 0;
|
|
MOZ_ASSERT(mOutputRow < mYFilter->num_values());
|
|
auto filterValues =
|
|
mYFilter->FilterForValue(mOutputRow, &filterOffset, &filterLength);
|
|
|
|
mNext.template WriteRows<uint32_t>([&](uint32_t* aRow, uint32_t aLength)
|
|
-> Maybe<WriteState> {
|
|
skia::ConvolveVertically(static_cast<const FilterValue*>(filterValues),
|
|
filterLength, mWindow.get(), mXFilter->num_values(),
|
|
reinterpret_cast<uint8_t*>(aRow), mHasAlpha,
|
|
supports_sse2() || supports_mmi());
|
|
return Some(WriteState::NEED_MORE_DATA);
|
|
});
|
|
|
|
mOutputRow++;
|
|
|
|
if (mOutputRow == mNext.InputSize().height) {
|
|
return; // We're done.
|
|
}
|
|
|
|
int32_t newFilterOffset = 0;
|
|
int32_t newFilterLength = 0;
|
|
GetFilterOffsetAndLength(mYFilter, mOutputRow,
|
|
&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.
|
|
mRowsInWindow -= diff;
|
|
mRowsInWindow = std::max(mRowsInWindow, 0);
|
|
for (int32_t i = 0; i < mRowsInWindow; ++i) {
|
|
std::swap(mWindow[i], mWindow[filterLength - mRowsInWindow + i]);
|
|
}
|
|
}
|
|
|
|
void ReleaseWindow()
|
|
{
|
|
if (!mWindow) {
|
|
return;
|
|
}
|
|
|
|
for (int32_t i = 0; i < mWindowCapacity; ++i) {
|
|
delete[] mWindow[i];
|
|
}
|
|
|
|
mWindow = nullptr;
|
|
mWindowCapacity = 0;
|
|
}
|
|
|
|
Next mNext; /// The next SurfaceFilter in the chain.
|
|
|
|
gfx::IntSize mInputSize; /// The size of the input image.
|
|
gfxSize mScale; /// The scale factors in each dimension.
|
|
/// Computed from @mInputSize and
|
|
/// the next filter's input size.
|
|
|
|
UniquePtr<uint8_t[]> mRowBuffer; /// The buffer into which input is written.
|
|
UniquePtr<uint8_t*[]> mWindow; /// The last few rows which were written.
|
|
|
|
UniquePtr<skia::ConvolutionFilter1D> mXFilter; /// The Lanczos filter in X.
|
|
UniquePtr<skia::ConvolutionFilter1D> mYFilter; /// The Lanczos filter in Y.
|
|
|
|
int32_t mWindowCapacity; /// How many rows the window contains.
|
|
|
|
int32_t mRowsInWindow; /// How many rows we've buffered in the window.
|
|
int32_t mInputRow; /// The current row we're reading. (0-indexed)
|
|
int32_t mOutputRow; /// The current row we're writing. (0-indexed)
|
|
|
|
bool mHasAlpha; /// If true, the image has transparency.
|
|
};
|
|
|
|
#endif
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_image_DownscalingFilter_h
|