mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
2121ac8f2e
- Bug 1207030 - Enable -Wshadow flag in more directories that have no -Wshadow warnings. r=glandium (0654c75bf5) - don't build hunspell unified (a576cbdc65) - Bug 1218315 - Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on rdf. r=nfroyd (795b627c84) - Bug 138009 - Remove unused platform.js, now with packaging goodness, r=mossop (f7547f1f16) - Bug 1195168 - Use channel->ascynOpen2 src/nsAutoConfig.cpp (r=sicking) (23ed743739) - Bug 1197926 - Use channel->Open2() in extensions/pref/autoconfig/src/nsReadConfig.cpp (r=sicking) (a6372aa60a) - Bug 1231256 (part 1) - Remove unused nsBoxLayoutState parameters from many functions. r=roc. (9d57344ee6) - Bug 1231256 (part 2) - Remove unused BlobDirState parameters from SetLazyData(). r=jld. (f3d62d9754) - Bug 1231256 (part 3) - Remove unused parameter from TryToOuterize(). r=roc. (0dc80be011) - Bug 1231256 (part 4) - Remove dead SetContext() declaration. r=jfkthame. (4108786c72) - Bug 1231256 (part 5) - Remove dead FromCSSPerspectiveInfo() function. r=vlad. (a9980426b0) - Bug 1231256 (part 6) - Remove unused parameter from Damage functions. r=roc. (e74906d54a) - Bug 1231256 (part 7) - Remove unused parameters from two layout functions. r=roc. (1cdcf91a10) - Bug 1231256 (part 8) - Remove unused parameters from MouseClicked(). r=roc. (2acf1b532b) - Bug 1231256 (part 9) - Remove unused parameter from ShowPopup(). r=roc. (e57daff2ee) - Bug 1231256 (part 10) - Remove unused parameters from StartAPZDrag(). r=roc. (b8d8ed57f4) - Bug 1231256 (part 11) - Remove unused parameter from HidePopupsInList(). r=roc. (ab9ea00111) - Bug 1231256 (part 12) - Remove TraceableVectorOperations::canAppendWithoutRealloc. r=terrence. (dc1ae504d5) - Bug 1230911 - modified asseert in order to prevent null pointer dereference. r=roc (71dce2e51c) - Bug 1230913 - modified assert in order to prevent null pointer dereference. r=roc (91b6092a83) - Bug 1228952 - Move texture metadata out of the BufferTextureClient/Host's buffer. r=Sotaro (5783f02382) - Bug 1215005 - SourceSurface has thread-safe refcount now. r=bas (13a0f58815) - Bug 1215438 - Part 1: Add utility functions to support transferring ImageBitmap. r=roc (5837bc686b) - Bug 1212009 - ReadFullySerializableObjects() doesn't use the aIndex param and it can be removed, r=smaug (db1b7f2a2c) - Bug 1215438 - Part 2: Add transfer support for ImageBitmap. r=baku (5f428ddaa3) - Bug 1215438 - Part 3: CairoImage can use in any thread. r=roc (7e6d6562ef) - Bug 1215438 - Part 4: Rename CairoImage to SourceSurfaceImage. r=roc (e336d6bcd7) - Bug 1215438 - Part 5: Add test for imagebitmap transfer. r=roc (71c7dbc4a5) - Bug 1172796 - Part 1: ImageEncoder can be used on worker thread. r=seth (8aa6b4d9bc) - Bug 1172796 - Part 2: Add write-only flag for origin-clean check. r=roc (dc4a1d5ef4) - Bug 1172796 - Part 3: Implement OffscreenCanvas constructor. r=roc r=smaug (466bef6e1a) - Bug 1172796 - Part 4: Implement OffscreenCanvas::ToBlob. r=roc r=smaug (0afb84ecb2) - Bug 1172796 - Part 5: Implements OffscreenCanvas::TransferImageBitmap. r=roc r=smaug (2709566e26) - Bug 1172796 - Part 6: Implements ImageBitmap::Close(). r=roc r=smaug (a45e423d77) - Bug 1172796 - Part 7: Implements ImageBitmapRenderingContext. r=roc r=smaug (c5a30f3132) - Bug 1172796 - Part 8: Add ImageBitmapRenderingContext to test_intefaces.html r=smaug (e8786603b2) - Bug 1172796 - Part 9: Use gfxPrefs to get webgl.enable-prototype-webgl2. r=jgilbert (c4ee72d49c) - fix Bug 1230686 - use RefPtr<DrawTarget>& instead of DrawTarget* (f92f5fae12) - reapply per misspatch Bug 1200595 - Consolidate the TextureClient's destruction logic. (960eb012ae) - Bug 1215236 - "Remove compilation warnings in StructuredCloneHolder". r=smaug (0ba2fdb23b) - Bug 1222123 - Warning fix in CompositorD3D11.cpp. r=Bas (f8d36dbb71) - Bug 1219494 - Part 4. gfx/layers and gfxCrash. r=mchang (b4046ee2df) - Bug 1229533: Ensure our RenderingTargetView for the backbuffer and the backbuffer itself have no lingering references, and log if they do. r=milan (89c9eed426) - Bug 1222569 - remove unused variables in CompositorD3D9.cpp; r=Bas (05f5a61e66) - Bug 1198021 - When the ContentClient of a ClientTiledPaintedLayer changes, don't destroy the old content client until after the layer transaction has been sent. r=nical (901edd5f56) - Bug 901097 - FileReader API in workers, r=sicking, r=nfroyd (01a4023d7e) - Bug 1217307 - Remove some unnecessary null checks in dom/base/. r=njn (4411cefe18) - Bug 264412. Implement HTMLElement.innerText. r=smaug,mats (28306eabfb) - Bug 1119157: Fix false over-recursion in web worker threads by cleaning up thread info in the processes forked from Nuwa. a=asuth (be1fb6ca67) - Bug 1125091 - Make Nuwa be Valgrind-friendly. r=njn. (bade1e2e1f) - Bug 1144535: Respect caller-specifed thread attributes in creating threads in the Nuwa process. r=asuth (33acdcf8ca) - Bug 1216354 - Disable LSan leak checking by default in mozglue. r=glandium (c8177284b2) - Bug 1196859 - Block Roboform binaries written against old SDK. r=bsmedberg (bf21a047ea) - Bug 763395 - Add nlsp.dll to blocklist. r=bsmedberg (ab96eafdbe) - Bug 1136968 - Add YCWebCameraSource.ax to DLL blocklist. r=benjamin (735282235d) - Bug 1170141 - Block RealNetworks Browser Record Plugin due to startup crashes. r=ehan (21937f4bc1) - Bug 1222819 - Add Orbit Downloader .dlls to Windows blocklist. r=aklotz (e8446eda95) - Bug 1198186 - increase limit used to detect int values passed as first argument to LdrLoadDll, r=dmajor (89f5ae4a87) - Bug 1151506: Block long hex name DLLs due to startup crashes. r=bsmedberg (34c0b81bfc) - Bug 1160148: Also block AVX2 in Win7RTM, and move the code to mozglue. r=froydnj (61ab36c6c6) - Bug 1203350 - Unify arithmetic operators in TimeStamp; r=froydnj (a96aeb7e11) - Bug 1179550 - Always terminate the str buffer. r=erahm (0c07fcad4f) - No bug, add missing include to StackWalk.cpp, DONTBUILD (88beda3fbb) - Bug 989499 - Part 2: Use FramePointerStackwalk on windows. r=rjmuizel (3f0db58ded) - Bug 989499 - Part 1: Add a way to get the stack top. r=BenWa (a1bdae796f) - Bug 1193838 - Expose ProfileGatherer as an nsISupports through nsIProfiler for process parent actors. r=BenWa (07121dd03d) - Bug 1233835 - Fix TaskTracer double init assert. r=mconley (895511b141) - Bug 1193838 - Make ProfileGatherer exist during the lifetime of a GeckoSampler. r=BenWa (9ca73c74e4) - Revert "Bug 1172157 - Save malformed profile JSON to file to help debug." (r=BenWa) (e4fc0084d4) - Bug 1196845 - Fix invalid JSON in saved Java thread profile; r=BenWa (d5b542da81) - Bug 1145333 - Skip NativeStackAddrs that conflict with pseudoStackAddrs and jsStackAddrs when merging sampler stacks. r=mstange (b50a048ab2) - Bug 1122721 - Don't call pthread_get_stackaddr_np during sampling. r=mstange (c6818c45a2) - Bug 1229850 - Avoid unnecessary combobox dropdown calculations in the content process. r=dbaron (174530328f) - Bug 1187605 pt 1 - In vertical writing modes, add an 'orientation' attribute with value='left' or 'right' to the <select> control's dropdown button. r=smontagu (76f9cb3fcd) - Bug 1187605 pt 2 - Make the <select> dropdown arrow respect the 'orientation' attribute, if present. r=smontagu (bd58cd1f89)
185 lines
5.7 KiB
C++
185 lines
5.7 KiB
C++
/* -*- Mode: C++; tab-width: 20; 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 "ImageDataSerializer.h"
|
|
#include <string.h> // for memcpy
|
|
#include "gfx2DGlue.h" // for SurfaceFormatToImageFormat
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
|
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
|
|
#include "mozilla/gfx/2D.h" // for DataSourceSurface, Factory
|
|
#include "mozilla/gfx/Logging.h" // for gfxDebug
|
|
#include "mozilla/gfx/Tools.h" // for GetAlignedStride, etc
|
|
#include "mozilla/gfx/Types.h"
|
|
#include "mozilla/mozalloc.h" // for operator delete, etc
|
|
#include "yuv_convert.h" // for ConvertYCbCrToRGB32, etc
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
namespace ImageDataSerializer {
|
|
|
|
using namespace gfx;
|
|
|
|
#define MOZ_ALIGN_WORD(x) (((x) + 3) & ~3)
|
|
|
|
int32_t
|
|
ComputeRGBStride(SurfaceFormat aFormat, int32_t aWidth)
|
|
{
|
|
CheckedInt<int32_t> size = BytesPerPixel(aFormat);
|
|
size *= aWidth;
|
|
if (!size.isValid() || size.value() <= 0) {
|
|
gfxDebug() << "ComputeStride overflow " << aWidth;
|
|
return 0;
|
|
}
|
|
|
|
return GetAlignedStride<4>(size.value());
|
|
}
|
|
|
|
int32_t
|
|
GetRGBStride(const RGBDescriptor& aDescriptor)
|
|
{
|
|
return ComputeRGBStride(aDescriptor.format(), aDescriptor.size().width);
|
|
}
|
|
|
|
uint32_t
|
|
ComputeRGBBufferSize(IntSize aSize, SurfaceFormat aFormat)
|
|
{
|
|
MOZ_ASSERT(aSize.height >= 0 && aSize.width >= 0);
|
|
|
|
// This takes care of checking whether there could be overflow
|
|
// with enough margin for the metadata.
|
|
if (!gfx::Factory::AllowedSurfaceSize(aSize)) {
|
|
return 0;
|
|
}
|
|
|
|
int32_t bufsize = GetAlignedStride<16>(ComputeRGBStride(aFormat, aSize.width)
|
|
* aSize.height);
|
|
|
|
if (bufsize < 0) {
|
|
// This should not be possible thanks to Factory::AllowedSurfaceSize
|
|
return 0;
|
|
}
|
|
|
|
return bufsize;
|
|
}
|
|
|
|
|
|
|
|
// Minimum required shmem size in bytes
|
|
uint32_t
|
|
ComputeYCbCrBufferSize(const gfx::IntSize& aYSize, int32_t aYStride,
|
|
const gfx::IntSize& aCbCrSize, int32_t aCbCrStride)
|
|
{
|
|
MOZ_ASSERT(aYSize.height >= 0 && aYSize.width >= 0);
|
|
|
|
if (aYSize.height < 0 || aYSize.width < 0 || aCbCrSize.height < 0 || aCbCrSize.width < 0 ||
|
|
aYSize.width > aYStride || aCbCrSize.width > aCbCrStride ||
|
|
aCbCrStride > aYStride || aCbCrSize.height > aYSize.height ||
|
|
!gfx::Factory::AllowedSurfaceSize(IntSize(aYStride, aYSize.height))) {
|
|
return 0;
|
|
}
|
|
// Overflow checks are performed in AllowedSurfaceSize
|
|
return MOZ_ALIGN_WORD(aYSize.height * aYStride)
|
|
+ 2 * MOZ_ALIGN_WORD(aCbCrSize.height * aCbCrStride);
|
|
}
|
|
|
|
// Minimum required shmem size in bytes
|
|
uint32_t
|
|
ComputeYCbCrBufferSize(const gfx::IntSize& aYSize, const gfx::IntSize& aCbCrSize)
|
|
{
|
|
return ComputeYCbCrBufferSize(aYSize, aYSize.width, aCbCrSize, aCbCrSize.width);
|
|
}
|
|
|
|
uint32_t
|
|
ComputeYCbCrBufferSize(uint32_t aBufferSize)
|
|
{
|
|
return MOZ_ALIGN_WORD(aBufferSize);
|
|
}
|
|
|
|
void ComputeYCbCrOffsets(int32_t yStride, int32_t yHeight,
|
|
int32_t cbCrStride, int32_t cbCrHeight,
|
|
uint32_t& outYOffset, uint32_t& outCbOffset, uint32_t& outCrOffset)
|
|
{
|
|
outYOffset = 0;
|
|
outCbOffset = outYOffset + MOZ_ALIGN_WORD(yStride * yHeight);
|
|
outCrOffset = outCbOffset + MOZ_ALIGN_WORD(cbCrStride * cbCrHeight);
|
|
}
|
|
|
|
gfx::SurfaceFormat FormatFromBufferDescriptor(const BufferDescriptor& aDescriptor)
|
|
{
|
|
switch (aDescriptor.type()) {
|
|
case BufferDescriptor::TRGBDescriptor:
|
|
return aDescriptor.get_RGBDescriptor().format();
|
|
case BufferDescriptor::TYCbCrDescriptor:
|
|
return gfx::SurfaceFormat::YUV;
|
|
default:
|
|
MOZ_CRASH();
|
|
}
|
|
}
|
|
|
|
gfx::IntSize SizeFromBufferDescriptor(const BufferDescriptor& aDescriptor)
|
|
{
|
|
switch (aDescriptor.type()) {
|
|
case BufferDescriptor::TRGBDescriptor:
|
|
return aDescriptor.get_RGBDescriptor().size();
|
|
case BufferDescriptor::TYCbCrDescriptor:
|
|
return aDescriptor.get_YCbCrDescriptor().ySize();
|
|
default:
|
|
MOZ_CRASH();
|
|
}
|
|
}
|
|
|
|
uint8_t* GetYChannel(uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor)
|
|
{
|
|
return aBuffer + aDescriptor.yOffset();
|
|
}
|
|
|
|
uint8_t* GetCbChannel(uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor)
|
|
{
|
|
return aBuffer + aDescriptor.cbOffset();
|
|
}
|
|
|
|
uint8_t* GetCrChannel(uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor)
|
|
{
|
|
return aBuffer + aDescriptor.crOffset();
|
|
}
|
|
|
|
already_AddRefed<DataSourceSurface>
|
|
DataSourceSurfaceFromYCbCrDescriptor(uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor)
|
|
{
|
|
gfx::IntSize ySize = aDescriptor.ySize();
|
|
gfx::IntSize cbCrSize = aDescriptor.cbCrSize();
|
|
int32_t yStride = ySize.width;
|
|
int32_t cbCrStride = cbCrSize.width;
|
|
|
|
RefPtr<DataSourceSurface> result =
|
|
Factory::CreateDataSourceSurface(ySize, gfx::SurfaceFormat::B8G8R8X8);
|
|
if (NS_WARN_IF(!result)) {
|
|
return nullptr;
|
|
}
|
|
|
|
DataSourceSurface::MappedSurface map;
|
|
if (NS_WARN_IF(!result->Map(DataSourceSurface::MapType::WRITE, &map))) {
|
|
return nullptr;
|
|
}
|
|
|
|
gfx::YUVType type = TypeFromSize(ySize.width, ySize.height,
|
|
cbCrSize.width, cbCrSize.height);
|
|
gfx::ConvertYCbCrToRGB32(GetYChannel(aBuffer, aDescriptor),
|
|
GetCbChannel(aBuffer, aDescriptor),
|
|
GetCrChannel(aBuffer, aDescriptor),
|
|
map.mData,
|
|
0, 0, //pic x and y
|
|
ySize.width, ySize.height,
|
|
yStride, cbCrStride,
|
|
map.mStride, type);
|
|
result->Unmap();
|
|
return result.forget();
|
|
}
|
|
|
|
|
|
} // namespace ImageDataSerializer
|
|
} // namespace layers
|
|
} // namespace mozilla
|