mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
d457251529
- Bug 1120715 - Part 6: Remove the dom.requestcache.enabled pref; r=bkelly (800c996a96) - Bug 1143222 - Put the DOM Cache tests in sequential mode again until we fix the rest of the intermittent failures; a=RyanVM (2ebdd659a1) - Bug 1255636 - Give a better error message when the Request constructor fails because of a cross-origin referrer URL; r=bkelly (d81a21c0bb) - Bug 1265056 - don't needlessly construct nsAutoCString temporaries in dom/; r=baku (3be49ca3fc) - Bug 1243849 - Restore support for accessing the Cache API from app:// URLs and also for storing requests/responses with app:// URLs within it; r=bkelly (eb56fa564c) - Bug 1263235, part 1 - Move PBrowser::AsyncMessage's data argument last. r=smaug (6852b87c22) - Bug 1263235, part 2 - Make PContent::AsyncMessage and PContentBridge::AsyncMessage's data argument last. r=smaug (9e8cd94461) - Bug 1263028 - send HTTP data to the content process in smaller chunks, r=michal (c0da548157) - Bug 1263235, part 3 - Move PHttpChannel::OnTransportAndData's data argument last. r=mayhemer (e1bf4f430f) - Bug 1263235, part 4 - Make PBrowserStream::Write's data argument last. r=jimm (8bcec4d541) - Bug 1260876 - Remove process switch code for signed package code (added by Bug 1186290). r=valentin. (cef270b44c) - Bug 1234575 - Empty fragment is ignored in URI of location header r=mcmanus (db68f102d8) - Bug 1262506 - Unused variable in a runnable in BackgroundParentImpl, r=ehsan (9288f0a111) - bug 1239166 - platform work to support Microsoft Family Safety functionality r=froydnj,mgoodwin,mhowell,rbarnes,vladan (adc357f3b3) - Bug 842818 - Make Crypto::GetRandomValues() work off the main thread r=baku,keeler,mt (533f8942c4) - Bug 1247089 - Add a mode to ReportToConsoleNonLocalized that ignores the calling location. r=bkelly (4be23e0869) - Bug 1258883 - Add a way to replace the entire Push service in tests. r=wchen (06a5f27016) - Bug 1243856 - Remove alarms from the Push H2 backend. r=dragana (60d146dc73) - Bug 1246066 - Clear PushService timeout tasks on uninitialization. r=itcambridge (461276a972) - Bug 1214338 - Implement Android GCM-based PushService protocol. r=rnewman r=kitcambridge (f2bb78994a) - Bug 1257821 - Support the new aesgcm content encoding scheme. r=mt (1da653c14a) - Bug 1243856 - Remove alarms from the Push WebSocket backend. r=dragana (43f74c4999) - Bug 1258145 - Remove waitForPromise from the xpcshell tests. r=wchen (cdd1aff2f6) - Bug 1253831 - Don't check actual intervals in the Push backoff test. r=wchen (859fa0bba3) - Bug 1246341 - Include status codes in "ack" and "unregister" requests. r=dragana (a62d0daf9b) - Bug 1246341 - Add a test for push event error reporting. r=dragana (013bc814e4) - Bug 1247089 - Log Web Push decryption errors. r=bkelly (ffc093dc2f) - Bug 1258221 - patch 2 - Port FileSystem API and DeviceStorage API to PBackground, r=smaug (c1c0e08bc0) - Bug 1258221 - patch 3 - Rename FileSystemTaskBase to FileSystemTaskChildBase, r=smaug (867a0e65fd) - Bug 1251032 - Don't return layersId or textureFactoryIdentifier as outparams in RenderFrameParent constructor. r=kanru (198ddff7fc) - Bug 1251032 - Send RenderFrame info down to child in CreateWindow message. r=kanru (87e9001088) - Bug 1251032 - Make it possible to assign a frameloader to RenderFrameParent after construction. r=kanru (96483d1282) - Bug 1254865 - Send disableglobalhistory state down to TabChild after construction asynchronously. r=smaug (3949285b62) - Bug 1238707 Release the window immediately in TabParent::Destroy() to avoid leaks. r=smaug (fc612485d7) - Bug 1256589 part.1 Move the implementation of StopPropagation() from dom::Event to WidgetEvent r=smaug (181721b64c) - Bug 1256589 part.2 Move the implementation of StopImmediatePropagation() from dom::Event to WidgetEvent r=smaug (554a0dc5b5) - Bug 1203059 part.1 nsXBLWincowKeyHandler mark WidgetEvent::mFlags if it's reserved by chrome before the event is dispatched into the content r=smaug (9162dd68cb) - Bug 1203059 part.2 When an event is reserved by chrome, it should be fired only on chrome r=smaug (35f082ca5f) - Bug 1203059 part.3 Installing and removing keyboard event listeners of nsXBLWindowKeyHandler should be done by the class itself r=smaug (1e06c2d0bc) - Bug 1203059 part.4 Update test_keycodes.xul for the new behavior r=smaug (3014d21c75) - Bug 1256589 part.3 Move the implementation of StopCrossProcessForwarding() from dom::Event to WidgetEvent r=smaug (96db915b51) - Bug 1257180 - patch 1 - Directory clonable to workers, r=smaug (5634acb08d) - Bug 1257180 - patch 2 - Directory can be sent via postMessage(), r=smaug (82ada39ae3) - Bug 1263311: Part 3 - s/nsCancelableRunnable/CancelableRunnable/g. r=froydnj (79d0a6c81f) - Bug 1253198: add WebRtcIce prefix to all ICE unit tests. r=bwc (9c18f5fd56) - Bug 1244926: added TCP socket filter to only allow outgoing STUN. r=jesup (75debfdc84) - Bug 1257405 - Increase auth secret length to 16 octets. r=mt (b1e000c331) - Bug 1257401 - Remove the worker descriptor for PushSubscription. r=khuey (5791fb69ef) - Bug 1257401 - Remove the worker descriptor for PushManager. r=khuey (e2c75903a9) - Bug 1257821 - Remove the authenticated aesgcm128 content coding scheme. r=mt,marco (64a2917910) - Bug 1256488 - Add a Base64 URL-decoder for C++ and chrome JS callers. r=mt,baku (0bbb250298) - Bug 1247685 - Validate and store app server keys in the Push service. r=mt (c3c026ccb1) - Bug 1252650 - Support loading PushService immediately on Android; r=kitcambridge (d59a37fec4) - Bug 1258595 - Shut down the Push service if errors occur at startup. r=wchen (eef1805652) - Bug 1258595 - Wait for the Push service to shut down between tests. r=wchen (c30cf92ce6) - Bug 1262618 - Fix an unchained promise and a couple of non-promise returns in the push service. r=wchen (8eadab5706) - Bug 1263747 - Log error messages when stringifying errors. r=bgrins (edffd0074e) - Bug 1265705 - Silence startup JavaScript strict warning in resource://gre/modules/PushService.jsm. r=kitcambridge (e7e210fb61) - Bug 1264062 - Don't bother checking which accelerated layer types are available if they're all disabled by pref r=milan (0d3208ad59) - Bug 1263346. Remove wrong Ivy Bridge device id. r=Bas (7e39e7f370) - fix misspatch (a67a111b2c) - Bug 1251334 - Create a disposable pref to force-disable e10s in an emergency. r=jimm (ef892d4474) - Bug 1254774 - error: member access into incomplete type 'nsIUUIDGenerator' after bug 1237847. r=aklotz (c1f334609f) - Bug 1257242 - Split the ::BrowserTabsRemoteAutostart() function into two parts, to allow for the blocking policies to be checked independently from the prefs checks. r=jimm (1babda578f) - Bug 1260190 - Disable e10s for accessibility users on OS X. r=jimm (219e5b1f19) - Bug 1237769 - Disable e10s on Windows XP if layers acceleration is requested r=milan (60f2434e9f) - Bug 1232911 - [3.2] Block VPX support in ADM on unsupported devices. r=snorp (6924aa073a) - Bug 1263249 - Bubble up unique failureId in GetFeatureStatus. r=mconley,milan (cd56eeab3c) - Bug 1219296 - Split fields not needed for repaints out from FrameMetrics. r=kats (9003ca634a) - Bug 1219296 - Factor out scroll snap information into a form that's usable by the compositor. r=kats (23d3e619a1) - Bug 1219296 - Make ScrollMetadata::sNullMetadata a StaticAutoPtr so that ScrollMetadata can admit nsTArray members. r=kats (1729ff7d93) - Bug 1257641 - Replace the mUpdateScrollOffset bool with an enum, needed in the next patch. r=botond (f9d546f8e8) - Bug 1257641 - Use empty transactions to carry scroll offset updates to APZ that don't require a repaint. r=mattwoodrow,mstange,botond (ba4a8a8c29) - Bug 1246290 - Add a bit to FrameMetrics to indicate if APZ-scrolling should be disabled on that APZC. r=botond (af2067137f) - Bug 1256589 part.4 Move the implementation of PreventDefault() and add PreventDefaultBeforeDispatch() from dom::Event to WidgetEvent r=smaug (e7828f2d8f) - Bug 1256589 part.5 Add DefaultPrevented() and DefaultPreventedByContent() to WidgetEvent r=smaug (e65cdd9127) - Bug 1249915 - Fix missing MOZ_COUNT_CTOR and some misc cleanup. r=karlt (d2f26cf971) - Bug 1154183 part.1 Move shortcut/access key candidate list creators from nsContentUtils to WidgetKeyboardEvent r=smaug (40b0b11a5a) - Bug 1154183 part.2 eKeyDown event should have charCode value of following keypress event r=smaug (28c1443ba3) - Bug 1154183 part.3 Clean up some variable names in nsXBLWindowKeyHandler::WalkHandlersAndExecute() r=smaug (81e25023d8) - Bug 1154183 part.4 Implement nsXBLWindowKeyHandler::GetElementForHandler() r=smaug (b5605d5c83) - Bug 1154183 part.5 Make nsXBLWindowKeyHandler::GetElementForHandler() use early return style r=smaug (017467204f) - Bug 1154183 part.6 Add nsXBLWindowKeyHandler::IsExecuteableElement() r=smaug (1fda349113) - Bug 1154183 part.7 Don't dispatch preceding keydown events of reserved keypress events on content in the default event group r=smaug (15b9e8c9d2) - Bug 1256589 part.6 Move the implementation of IsTrusted() from dom::Event to WidgetEvent r=smaug (ec79520fd3) - Bug 1253044. Fix fall through of observer topics when other conditions aren't met in PresShell::Observe. r=dholbert (dcc36884aa) - Bug 1157546 - Replace the image visibility API with a more general API that tracks visibility for any kind of frame. r=mstange (d6ea061614) - Bug 1219296 - Factor out the algorithm that computes a scroll snap destination into a reusable form. r=kats (296cbe9e49) - Bug 1254275 - Inspect the event queue to find out whether momentum events are following. r=kats (b2bb8a26b9) - Bug 1219296 - Scroll snap directly in APZ instead of going through the main thread. r=kats (0a30b550f9) - Bug 1219296 - Fix an include-what-you-use error. r=kats (4a128ae98e) - Bug 1260588 - C++ APZ should only allow handoff to ancestor APZC r=botond (9856ab5160) - Bug 1257269 - Panning up in a scrollable element should not hide the toolbar r=kats,jchen (1036ffc9e3) - Bug 1219296 - Ship scroll snap information to the compositor. r=kats (0e920f02a1) - Bug 1219296 - Move the layout.css.scroll-snap.proximity-threshold pref to gfxPrefs, so it can be queried on the compositor thread. r=kats (2e3e1ec16e) - Bug 1219296 - Remove StartSmoothScroll()'s argument, which is no longer used. r=kats (12efcd9c79) - Bug 1219296 - Light refactoring to how a smooth scroll is launched inside APZC. r=kats (ba6a9ed9a2) - Bug 1219296 - Followup to fix stale code comments. r=me and DONTBUILD (fec5f65988) - Bug 1257641 - Remove now-unused code for the lightweight scroll offset update message. r=botond (d449e45d6d) - Bug 1236680 Part 1: Add new WinUtils function to Resolve moved Users folder. r=jimm (51d12f856c) - Bug 1236680 Part 2: Resolve GMP path for moved Users folder. r=cpearce (e568217b78) - Bug 1236680 Part 3: Add #ifs to include to fix bustage. r=me (40c38680ea) - Bug 1240315: Add startup crash report annotation for AppInit_DLLs; r=jimm (aa2040baae) - Bug 1253446 - patch 2 - Return the proper scaling factor when querying the primary screen on Windows. r=emk (9765e4f7ca) - Bug 1251624 - patch 1 - The desktop to device scaling in WinUtils::MonitorFromRect should not depend on custom CSS pixel scaling (devPixelsPerPx setting). r=emk (788b4ad5db) - Bug 1251624 - patch 2 - Check for scaling override (devPixelsPerPx setting) in nsScreenWin::GetDefaultCSSScaleFactor, for proper window positioning when a custom scale factor is used. r=emk (2843a3fe70) - Bug 1222149 - delete unused fields from AsyncEncodeAndWriteIcon; r=roc clang-cl says these are unused, so let's delete them. (62cf7f8f47) - Bug 1204809 - Notify (don't hang) third party windows when adding shortcut icon. r=jmathies (7e4058a0f8) - Bug 1253566 - Deal with char16_t/wchar_t mismatch. r=aklotz (1c6cf160c7) - Bug 1211941 - Let nsICacheStorage.openTruncate impl return an HTTP cache entry write handle, r=michal (6a5796fb93) - Bug 1050613 - Make sure force-valid for HTTP cache entries is removed when entries are removed, r=michal (9efb91eefc) - Bug 1248389 - Cache index causing CPU loops, r=honzab (175b5b27f2) - Bug 1066970 - Show 'calculating' during HTTP cache cleaning process in preferences window, r=michal (db722000d8) - Bug 1248958 - CacheIndex mRWBuf ownership too fragile, read-after-free, r=honzab (66ee3d1d0d) - Bug 1248003 - Purge from HTTP cache memory pool only in reasonable intervals, r=michal (1cd6cb5983) - Bug 1068674 - Don't turn off e10s if hardware acceleration is disabled. r=jimm (dfbef44278)
576 lines
19 KiB
C++
576 lines
19 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 "ImageEncoder.h"
|
|
#include "mozilla/dom/CanvasRenderingContext2D.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/gfx/DataSurfaceHelpers.h"
|
|
#include "mozilla/layers/AsyncCanvasRenderer.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "mozilla/SyncRunnable.h"
|
|
#include "mozilla/unused.h"
|
|
#include "gfxUtils.h"
|
|
#include "nsIThreadPool.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsXPCOMCIDInternal.h"
|
|
#include "WorkerPrivate.h"
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
// This class should be placed inside GetBRGADataSourceSurfaceSync(). However,
|
|
// due to B2G ICS uses old complier (C++98/03) which forbids local class as
|
|
// template parameter, we need to move this class outside.
|
|
class SurfaceHelper : public nsRunnable {
|
|
public:
|
|
explicit SurfaceHelper(already_AddRefed<layers::Image> aImage) : mImage(aImage) {}
|
|
|
|
// It retrieves a SourceSurface reference and convert color format on main
|
|
// thread and passes DataSourceSurface to caller thread.
|
|
NS_IMETHOD Run() {
|
|
// It guarantees the reference will be released on main thread.
|
|
nsCountedRef<nsMainThreadSourceSurfaceRef> surface;
|
|
surface.own(mImage->GetAsSourceSurface().take());
|
|
|
|
if (surface->GetFormat() == gfx::SurfaceFormat::B8G8R8A8) {
|
|
mDataSourceSurface = surface->GetDataSurface();
|
|
} else {
|
|
mDataSourceSurface = gfxUtils::
|
|
CopySurfaceToDataSourceSurfaceWithFormat(surface,
|
|
gfx::SurfaceFormat::B8G8R8A8);
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<gfx::DataSourceSurface> GetDataSurfaceSafe() {
|
|
nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
|
|
MOZ_ASSERT(mainThread);
|
|
SyncRunnable::DispatchToThread(mainThread, this, false);
|
|
|
|
return mDataSourceSurface.forget();
|
|
}
|
|
|
|
private:
|
|
RefPtr<layers::Image> mImage;
|
|
RefPtr<gfx::DataSourceSurface> mDataSourceSurface;
|
|
};
|
|
|
|
// This function returns a DataSourceSurface in B8G8R8A8 format.
|
|
// It uses SourceSurface to do format convert. Because most SourceSurface in
|
|
// image formats should be referenced or dereferenced on main thread, it uses a
|
|
// sync class SurfaceHelper to retrieve SourceSurface and convert to B8G8R8A8 on
|
|
// main thread.
|
|
already_AddRefed<DataSourceSurface>
|
|
GetBRGADataSourceSurfaceSync(already_AddRefed<layers::Image> aImage)
|
|
{
|
|
RefPtr<SurfaceHelper> helper = new SurfaceHelper(Move(aImage));
|
|
return helper->GetDataSurfaceSafe();
|
|
}
|
|
|
|
class EncodingCompleteEvent : public CancelableRunnable
|
|
{
|
|
virtual ~EncodingCompleteEvent() {}
|
|
|
|
public:
|
|
explicit EncodingCompleteEvent(EncodeCompleteCallback* aEncodeCompleteCallback)
|
|
: mImgSize(0)
|
|
, mType()
|
|
, mImgData(nullptr)
|
|
, mEncodeCompleteCallback(aEncodeCompleteCallback)
|
|
, mFailed(false)
|
|
{
|
|
if (!NS_IsMainThread() && workers::GetCurrentThreadWorkerPrivate()) {
|
|
mCreationThread = NS_GetCurrentThread();
|
|
} else {
|
|
NS_GetMainThread(getter_AddRefs(mCreationThread));
|
|
}
|
|
}
|
|
|
|
NS_IMETHOD Run() override
|
|
{
|
|
nsresult rv = NS_OK;
|
|
|
|
if (!mFailed) {
|
|
// The correct parentObject has to be set by the mEncodeCompleteCallback.
|
|
RefPtr<Blob> blob =
|
|
Blob::CreateMemoryBlob(nullptr, mImgData, mImgSize, mType);
|
|
MOZ_ASSERT(blob);
|
|
|
|
rv = mEncodeCompleteCallback->ReceiveBlob(blob.forget());
|
|
}
|
|
|
|
mEncodeCompleteCallback = nullptr;
|
|
|
|
return rv;
|
|
}
|
|
|
|
void SetMembers(void* aImgData, uint64_t aImgSize, const nsAutoString& aType)
|
|
{
|
|
mImgData = aImgData;
|
|
mImgSize = aImgSize;
|
|
mType = aType;
|
|
}
|
|
|
|
void SetFailed()
|
|
{
|
|
mFailed = true;
|
|
}
|
|
|
|
nsIThread* GetCreationThread()
|
|
{
|
|
return mCreationThread;
|
|
}
|
|
|
|
private:
|
|
uint64_t mImgSize;
|
|
nsAutoString mType;
|
|
void* mImgData;
|
|
nsCOMPtr<nsIThread> mCreationThread;
|
|
RefPtr<EncodeCompleteCallback> mEncodeCompleteCallback;
|
|
bool mFailed;
|
|
};
|
|
|
|
class EncodingRunnable : public nsRunnable
|
|
{
|
|
virtual ~EncodingRunnable() {}
|
|
|
|
public:
|
|
NS_DECL_ISUPPORTS_INHERITED
|
|
|
|
EncodingRunnable(const nsAString& aType,
|
|
const nsAString& aOptions,
|
|
UniquePtr<uint8_t[]> aImageBuffer,
|
|
layers::Image* aImage,
|
|
imgIEncoder* aEncoder,
|
|
EncodingCompleteEvent* aEncodingCompleteEvent,
|
|
int32_t aFormat,
|
|
const nsIntSize aSize,
|
|
bool aUsingCustomOptions)
|
|
: mType(aType)
|
|
, mOptions(aOptions)
|
|
, mImageBuffer(Move(aImageBuffer))
|
|
, mImage(aImage)
|
|
, mEncoder(aEncoder)
|
|
, mEncodingCompleteEvent(aEncodingCompleteEvent)
|
|
, mFormat(aFormat)
|
|
, mSize(aSize)
|
|
, mUsingCustomOptions(aUsingCustomOptions)
|
|
{}
|
|
|
|
nsresult ProcessImageData(uint64_t* aImgSize, void** aImgData)
|
|
{
|
|
nsCOMPtr<nsIInputStream> stream;
|
|
nsresult rv = ImageEncoder::ExtractDataInternal(mType,
|
|
mOptions,
|
|
mImageBuffer.get(),
|
|
mFormat,
|
|
mSize,
|
|
mImage,
|
|
nullptr,
|
|
nullptr,
|
|
getter_AddRefs(stream),
|
|
mEncoder);
|
|
|
|
// If there are unrecognized custom parse options, we should fall back to
|
|
// the default values for the encoder without any options at all.
|
|
if (rv == NS_ERROR_INVALID_ARG && mUsingCustomOptions) {
|
|
rv = ImageEncoder::ExtractDataInternal(mType,
|
|
EmptyString(),
|
|
mImageBuffer.get(),
|
|
mFormat,
|
|
mSize,
|
|
mImage,
|
|
nullptr,
|
|
nullptr,
|
|
getter_AddRefs(stream),
|
|
mEncoder);
|
|
}
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = stream->Available(aImgSize);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
NS_ENSURE_TRUE(*aImgSize <= UINT32_MAX, NS_ERROR_FILE_TOO_BIG);
|
|
|
|
rv = NS_ReadInputStreamToBuffer(stream, aImgData, *aImgSize);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHOD Run() override
|
|
{
|
|
uint64_t imgSize;
|
|
void* imgData = nullptr;
|
|
|
|
nsresult rv = ProcessImageData(&imgSize, &imgData);
|
|
if (NS_FAILED(rv)) {
|
|
mEncodingCompleteEvent->SetFailed();
|
|
} else {
|
|
mEncodingCompleteEvent->SetMembers(imgData, imgSize, mType);
|
|
}
|
|
rv = mEncodingCompleteEvent->GetCreationThread()->
|
|
Dispatch(mEncodingCompleteEvent, nsIThread::DISPATCH_NORMAL);
|
|
if (NS_FAILED(rv)) {
|
|
// Better to leak than to crash.
|
|
Unused << mEncodingCompleteEvent.forget();
|
|
return rv;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
private:
|
|
nsAutoString mType;
|
|
nsAutoString mOptions;
|
|
UniquePtr<uint8_t[]> mImageBuffer;
|
|
RefPtr<layers::Image> mImage;
|
|
nsCOMPtr<imgIEncoder> mEncoder;
|
|
RefPtr<EncodingCompleteEvent> mEncodingCompleteEvent;
|
|
int32_t mFormat;
|
|
const nsIntSize mSize;
|
|
bool mUsingCustomOptions;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED0(EncodingRunnable, nsRunnable);
|
|
|
|
StaticRefPtr<nsIThreadPool> ImageEncoder::sThreadPool;
|
|
|
|
/* static */
|
|
nsresult
|
|
ImageEncoder::ExtractData(nsAString& aType,
|
|
const nsAString& aOptions,
|
|
const nsIntSize aSize,
|
|
nsICanvasRenderingContextInternal* aContext,
|
|
layers::AsyncCanvasRenderer* aRenderer,
|
|
nsIInputStream** aStream)
|
|
{
|
|
nsCOMPtr<imgIEncoder> encoder = ImageEncoder::GetImageEncoder(aType);
|
|
if (!encoder) {
|
|
return NS_IMAGELIB_ERROR_NO_ENCODER;
|
|
}
|
|
|
|
return ExtractDataInternal(aType, aOptions, nullptr, 0, aSize, nullptr,
|
|
aContext, aRenderer, aStream, encoder);
|
|
}
|
|
|
|
/* static */
|
|
nsresult
|
|
ImageEncoder::ExtractDataFromLayersImageAsync(nsAString& aType,
|
|
const nsAString& aOptions,
|
|
bool aUsingCustomOptions,
|
|
layers::Image* aImage,
|
|
EncodeCompleteCallback* aEncodeCallback)
|
|
{
|
|
nsCOMPtr<imgIEncoder> encoder = ImageEncoder::GetImageEncoder(aType);
|
|
if (!encoder) {
|
|
return NS_IMAGELIB_ERROR_NO_ENCODER;
|
|
}
|
|
|
|
nsresult rv = EnsureThreadPool();
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
RefPtr<EncodingCompleteEvent> completeEvent =
|
|
new EncodingCompleteEvent(aEncodeCallback);
|
|
|
|
nsIntSize size(aImage->GetSize().width, aImage->GetSize().height);
|
|
nsCOMPtr<nsIRunnable> event = new EncodingRunnable(aType,
|
|
aOptions,
|
|
nullptr,
|
|
aImage,
|
|
encoder,
|
|
completeEvent,
|
|
imgIEncoder::INPUT_FORMAT_HOSTARGB,
|
|
size,
|
|
aUsingCustomOptions);
|
|
return sThreadPool->Dispatch(event, NS_DISPATCH_NORMAL);
|
|
}
|
|
|
|
/* static */
|
|
nsresult
|
|
ImageEncoder::ExtractDataAsync(nsAString& aType,
|
|
const nsAString& aOptions,
|
|
bool aUsingCustomOptions,
|
|
UniquePtr<uint8_t[]> aImageBuffer,
|
|
int32_t aFormat,
|
|
const nsIntSize aSize,
|
|
EncodeCompleteCallback* aEncodeCallback)
|
|
{
|
|
nsCOMPtr<imgIEncoder> encoder = ImageEncoder::GetImageEncoder(aType);
|
|
if (!encoder) {
|
|
return NS_IMAGELIB_ERROR_NO_ENCODER;
|
|
}
|
|
|
|
nsresult rv = EnsureThreadPool();
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
RefPtr<EncodingCompleteEvent> completeEvent =
|
|
new EncodingCompleteEvent(aEncodeCallback);
|
|
|
|
nsCOMPtr<nsIRunnable> event = new EncodingRunnable(aType,
|
|
aOptions,
|
|
Move(aImageBuffer),
|
|
nullptr,
|
|
encoder,
|
|
completeEvent,
|
|
aFormat,
|
|
aSize,
|
|
aUsingCustomOptions);
|
|
return sThreadPool->Dispatch(event, NS_DISPATCH_NORMAL);
|
|
}
|
|
|
|
/*static*/ nsresult
|
|
ImageEncoder::GetInputStream(int32_t aWidth,
|
|
int32_t aHeight,
|
|
uint8_t* aImageBuffer,
|
|
int32_t aFormat,
|
|
imgIEncoder* aEncoder,
|
|
const char16_t* aEncoderOptions,
|
|
nsIInputStream** aStream)
|
|
{
|
|
nsresult rv =
|
|
aEncoder->InitFromData(aImageBuffer,
|
|
aWidth * aHeight * 4, aWidth, aHeight, aWidth * 4,
|
|
aFormat,
|
|
nsDependentString(aEncoderOptions));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
return CallQueryInterface(aEncoder, aStream);
|
|
}
|
|
|
|
/* static */
|
|
nsresult
|
|
ImageEncoder::ExtractDataInternal(const nsAString& aType,
|
|
const nsAString& aOptions,
|
|
uint8_t* aImageBuffer,
|
|
int32_t aFormat,
|
|
const nsIntSize aSize,
|
|
layers::Image* aImage,
|
|
nsICanvasRenderingContextInternal* aContext,
|
|
layers::AsyncCanvasRenderer* aRenderer,
|
|
nsIInputStream** aStream,
|
|
imgIEncoder* aEncoder)
|
|
{
|
|
if (aSize.IsEmpty()) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
nsCOMPtr<nsIInputStream> imgStream;
|
|
|
|
// get image bytes
|
|
nsresult rv;
|
|
if (aImageBuffer) {
|
|
rv = ImageEncoder::GetInputStream(
|
|
aSize.width,
|
|
aSize.height,
|
|
aImageBuffer,
|
|
aFormat,
|
|
aEncoder,
|
|
nsPromiseFlatString(aOptions).get(),
|
|
getter_AddRefs(imgStream));
|
|
} else if (aContext) {
|
|
NS_ConvertUTF16toUTF8 encoderType(aType);
|
|
rv = aContext->GetInputStream(encoderType.get(),
|
|
nsPromiseFlatString(aOptions).get(),
|
|
getter_AddRefs(imgStream));
|
|
} else if (aRenderer) {
|
|
NS_ConvertUTF16toUTF8 encoderType(aType);
|
|
rv = aRenderer->GetInputStream(encoderType.get(),
|
|
nsPromiseFlatString(aOptions).get(),
|
|
getter_AddRefs(imgStream));
|
|
} else if (aImage) {
|
|
// It is safe to convert PlanarYCbCr format from YUV to RGB off-main-thread.
|
|
// Other image formats could have problem to convert format off-main-thread.
|
|
// So here it uses a help function GetBRGADataSourceSurfaceSync() to convert
|
|
// format on main thread.
|
|
if (aImage->GetFormat() == ImageFormat::PLANAR_YCBCR) {
|
|
nsTArray<uint8_t> data;
|
|
layers::PlanarYCbCrImage* ycbcrImage = static_cast<layers::PlanarYCbCrImage*> (aImage);
|
|
gfxImageFormat format = SurfaceFormat::A8R8G8B8_UINT32;
|
|
uint32_t stride = GetAlignedStride<16>(aSize.width * 4);
|
|
size_t length = BufferSizeFromStrideAndHeight(stride, aSize.height);
|
|
data.SetCapacity(length);
|
|
|
|
gfxUtils::ConvertYCbCrToRGB(*ycbcrImage->GetData(),
|
|
format,
|
|
aSize,
|
|
data.Elements(),
|
|
stride);
|
|
|
|
rv = aEncoder->InitFromData(data.Elements(),
|
|
aSize.width * aSize.height * 4,
|
|
aSize.width,
|
|
aSize.height,
|
|
aSize.width * 4,
|
|
imgIEncoder::INPUT_FORMAT_HOSTARGB,
|
|
aOptions);
|
|
} else {
|
|
RefPtr<gfx::DataSourceSurface> dataSurface;
|
|
RefPtr<layers::Image> image(aImage);
|
|
dataSurface = GetBRGADataSourceSurfaceSync(image.forget());
|
|
|
|
DataSourceSurface::MappedSurface map;
|
|
if (!dataSurface->Map(gfx::DataSourceSurface::MapType::READ, &map)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
rv = aEncoder->InitFromData(map.mData,
|
|
aSize.width * aSize.height * 4,
|
|
aSize.width,
|
|
aSize.height,
|
|
aSize.width * 4,
|
|
imgIEncoder::INPUT_FORMAT_HOSTARGB,
|
|
aOptions);
|
|
dataSurface->Unmap();
|
|
}
|
|
|
|
if (NS_SUCCEEDED(rv)) {
|
|
imgStream = do_QueryInterface(aEncoder);
|
|
}
|
|
} else {
|
|
CheckedInt32 requiredBytes = CheckedInt32(aSize.width) * CheckedInt32(aSize.height) * 4;
|
|
if (MOZ_UNLIKELY(!requiredBytes.isValid())) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
// no context, so we have to encode an empty image
|
|
// note that if we didn't have a current context, the spec says we're
|
|
// supposed to just return transparent black pixels of the canvas
|
|
// dimensions.
|
|
RefPtr<DataSourceSurface> emptyCanvas =
|
|
Factory::CreateDataSourceSurfaceWithStride(IntSize(aSize.width, aSize.height),
|
|
SurfaceFormat::B8G8R8A8,
|
|
4 * aSize.width, true);
|
|
if (NS_WARN_IF(!emptyCanvas)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
DataSourceSurface::MappedSurface map;
|
|
if (!emptyCanvas->Map(DataSourceSurface::MapType::WRITE, &map)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
rv = aEncoder->InitFromData(map.mData,
|
|
aSize.width * aSize.height * 4,
|
|
aSize.width,
|
|
aSize.height,
|
|
aSize.width * 4,
|
|
imgIEncoder::INPUT_FORMAT_HOSTARGB,
|
|
aOptions);
|
|
emptyCanvas->Unmap();
|
|
if (NS_SUCCEEDED(rv)) {
|
|
imgStream = do_QueryInterface(aEncoder);
|
|
}
|
|
}
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
imgStream.forget(aStream);
|
|
return rv;
|
|
}
|
|
|
|
/* static */
|
|
already_AddRefed<imgIEncoder>
|
|
ImageEncoder::GetImageEncoder(nsAString& aType)
|
|
{
|
|
// Get an image encoder for the media type.
|
|
nsCString encoderCID("@mozilla.org/image/encoder;2?type=");
|
|
NS_ConvertUTF16toUTF8 encoderType(aType);
|
|
encoderCID += encoderType;
|
|
nsCOMPtr<imgIEncoder> encoder = do_CreateInstance(encoderCID.get());
|
|
|
|
if (!encoder && aType != NS_LITERAL_STRING("image/png")) {
|
|
// Unable to create an encoder instance of the specified type. Falling back
|
|
// to PNG.
|
|
aType.AssignLiteral("image/png");
|
|
nsCString PNGEncoderCID("@mozilla.org/image/encoder;2?type=image/png");
|
|
encoder = do_CreateInstance(PNGEncoderCID.get());
|
|
}
|
|
|
|
return encoder.forget();
|
|
}
|
|
|
|
class EncoderThreadPoolTerminator final : public nsIObserver
|
|
{
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
|
|
NS_IMETHODIMP Observe(nsISupports *, const char *topic, const char16_t *) override
|
|
{
|
|
NS_ASSERTION(!strcmp(topic, "xpcom-shutdown-threads"),
|
|
"Unexpected topic");
|
|
if (ImageEncoder::sThreadPool) {
|
|
ImageEncoder::sThreadPool->Shutdown();
|
|
ImageEncoder::sThreadPool = nullptr;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
private:
|
|
~EncoderThreadPoolTerminator() {}
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(EncoderThreadPoolTerminator, nsIObserver)
|
|
|
|
static void
|
|
RegisterEncoderThreadPoolTerminatorObserver()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
|
|
NS_ASSERTION(os, "do_GetService failed");
|
|
os->AddObserver(new EncoderThreadPoolTerminator(),
|
|
"xpcom-shutdown-threads",
|
|
false);
|
|
}
|
|
|
|
/* static */
|
|
nsresult
|
|
ImageEncoder::EnsureThreadPool()
|
|
{
|
|
if (!sThreadPool) {
|
|
nsCOMPtr<nsIThreadPool> threadPool = do_CreateInstance(NS_THREADPOOL_CONTRACTID);
|
|
sThreadPool = threadPool;
|
|
|
|
if (!NS_IsMainThread()) {
|
|
NS_DispatchToMainThread(NS_NewRunnableFunction([]() -> void {
|
|
RegisterEncoderThreadPoolTerminatorObserver();
|
|
}));
|
|
} else {
|
|
RegisterEncoderThreadPoolTerminatorObserver();
|
|
}
|
|
|
|
const uint32_t kThreadLimit = 2;
|
|
const uint32_t kIdleThreadLimit = 1;
|
|
const uint32_t kIdleThreadTimeoutMs = 30000;
|
|
|
|
nsresult rv = sThreadPool->SetName(NS_LITERAL_CSTRING("EncodingRunnable"));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
rv = sThreadPool->SetThreadLimit(kThreadLimit);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
rv = sThreadPool->SetIdleThreadLimit(kIdleThreadLimit);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
rv = sThreadPool->SetIdleThreadTimeout(kIdleThreadTimeoutMs);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|