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)
232 lines
7.3 KiB
C++
232 lines
7.3 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 "SharedPlanarYCbCrImage.h"
|
|
#include <stddef.h> // for size_t
|
|
#include <stdio.h> // for printf
|
|
#include "gfx2DGlue.h" // for Moz2D transition helpers
|
|
#include "ISurfaceAllocator.h" // for ISurfaceAllocator, etc
|
|
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
|
|
#include "mozilla/gfx/Types.h" // for SurfaceFormat::SurfaceFormat::YUV
|
|
#include "mozilla/ipc/SharedMemory.h" // for SharedMemory, etc
|
|
#include "mozilla/layers/ImageClient.h" // for ImageClient
|
|
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
|
|
#include "mozilla/layers/TextureClient.h"
|
|
#include "mozilla/layers/BufferTexture.h"
|
|
#include "mozilla/layers/ImageDataSerializer.h"
|
|
#include "mozilla/layers/ImageBridgeChild.h" // for ImageBridgeChild
|
|
#include "mozilla/mozalloc.h" // for operator delete
|
|
#include "nsISupportsImpl.h" // for Image::AddRef
|
|
#include "mozilla/ipc/Shmem.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
using namespace mozilla::ipc;
|
|
|
|
SharedPlanarYCbCrImage::SharedPlanarYCbCrImage(ImageClient* aCompositable)
|
|
: mCompositable(aCompositable)
|
|
{
|
|
MOZ_COUNT_CTOR(SharedPlanarYCbCrImage);
|
|
}
|
|
|
|
SharedPlanarYCbCrImage::~SharedPlanarYCbCrImage() {
|
|
MOZ_COUNT_DTOR(SharedPlanarYCbCrImage);
|
|
|
|
if (mCompositable->GetAsyncID() != 0 &&
|
|
!InImageBridgeChildThread()) {
|
|
if (mTextureClient) {
|
|
ADDREF_MANUALLY(mTextureClient);
|
|
ImageBridgeChild::DispatchReleaseTextureClient(mTextureClient);
|
|
mTextureClient = nullptr;
|
|
}
|
|
|
|
ImageBridgeChild::DispatchReleaseImageClient(mCompositable.forget().take());
|
|
}
|
|
}
|
|
|
|
size_t
|
|
SharedPlanarYCbCrImage::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
|
|
{
|
|
// NB: Explicitly skipping mTextureClient, the memory is already reported
|
|
// at time of allocation in GfxMemoryImageReporter.
|
|
// Not owned:
|
|
// - mCompositable
|
|
return 0;
|
|
}
|
|
|
|
TextureClient*
|
|
SharedPlanarYCbCrImage::GetTextureClient(CompositableClient* aClient)
|
|
{
|
|
return mTextureClient.get();
|
|
}
|
|
|
|
uint8_t*
|
|
SharedPlanarYCbCrImage::GetBuffer()
|
|
{
|
|
// This should never be used
|
|
MOZ_ASSERT(false);
|
|
return nullptr;
|
|
}
|
|
|
|
already_AddRefed<gfx::SourceSurface>
|
|
SharedPlanarYCbCrImage::GetAsSourceSurface()
|
|
{
|
|
if (!mTextureClient) {
|
|
NS_WARNING("Can't get as surface");
|
|
return nullptr;
|
|
}
|
|
return PlanarYCbCrImage::GetAsSourceSurface();
|
|
}
|
|
|
|
bool
|
|
SharedPlanarYCbCrImage::SetData(const PlanarYCbCrData& aData)
|
|
{
|
|
// If mTextureClient has not already been allocated (through Allocate(aData))
|
|
// allocate it. This code path is slower than the one used when Allocate has
|
|
// been called since it will trigger a full copy.
|
|
PlanarYCbCrData data = aData;
|
|
if (!mTextureClient && !Allocate(data)) {
|
|
return false;
|
|
}
|
|
|
|
TextureClientAutoLock autoLock(mTextureClient, OpenMode::OPEN_WRITE_ONLY);
|
|
if (!autoLock.Succeeded()) {
|
|
MOZ_ASSERT(false, "Failed to lock the texture.");
|
|
return false;
|
|
}
|
|
|
|
if (!UpdateYCbCrTextureClient(mTextureClient, aData)) {
|
|
MOZ_ASSERT(false, "Failed to copy YCbCr data into the TextureClient");
|
|
return false;
|
|
}
|
|
mTextureClient->MarkImmutable();
|
|
return true;
|
|
}
|
|
|
|
// needs to be overriden because the parent class sets mBuffer which we
|
|
// do not want to happen.
|
|
uint8_t*
|
|
SharedPlanarYCbCrImage::AllocateAndGetNewBuffer(uint32_t aSize)
|
|
{
|
|
MOZ_ASSERT(!mTextureClient, "This image already has allocated data");
|
|
size_t size = ImageDataSerializer::ComputeYCbCrBufferSize(aSize);
|
|
if (!size) {
|
|
return nullptr;
|
|
}
|
|
|
|
mTextureClient = TextureClient::CreateForYCbCrWithBufferSize(mCompositable->GetForwarder(),
|
|
gfx::SurfaceFormat::YUV, size,
|
|
mCompositable->GetTextureFlags());
|
|
|
|
// get new buffer _without_ setting mBuffer.
|
|
if (!mTextureClient) {
|
|
return nullptr;
|
|
}
|
|
|
|
// update buffer size
|
|
mBufferSize = size;
|
|
|
|
MappedYCbCrTextureData mapped;
|
|
if (mTextureClient->BorrowMappedYCbCrData(mapped)) {
|
|
// The caller expects a pointer to the beginning of the writable part of the
|
|
// buffer which is where the y channel starts by default.
|
|
return mapped.y.data;
|
|
} else {
|
|
MOZ_CRASH();
|
|
}
|
|
}
|
|
|
|
bool
|
|
SharedPlanarYCbCrImage::SetDataNoCopy(const Data &aData)
|
|
{
|
|
// SetDataNoCopy is used to update YUV plane offsets without (re)allocating
|
|
// memory previously allocated with AllocateAndGetNewBuffer().
|
|
|
|
MOZ_ASSERT(mTextureClient, "This Image should have already allocated data");
|
|
if (!mTextureClient) {
|
|
return false;
|
|
}
|
|
mData = aData;
|
|
mSize = aData.mPicSize;
|
|
|
|
uint8_t *base = GetBuffer();
|
|
uint32_t yOffset = aData.mYChannel - base;
|
|
uint32_t cbOffset = aData.mCbChannel - base;
|
|
uint32_t crOffset = aData.mCrChannel - base;
|
|
|
|
static_cast<BufferTextureData*>(mTextureClient->GetInternalData())->SetDesciptor(
|
|
YCbCrDescriptor(aData.mYSize, aData.mCbCrSize, yOffset, cbOffset, crOffset,
|
|
aData.mStereoMode)
|
|
);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
SharedPlanarYCbCrImage::IsValid() {
|
|
return !!mTextureClient;
|
|
}
|
|
|
|
bool
|
|
SharedPlanarYCbCrImage::Allocate(PlanarYCbCrData& aData)
|
|
{
|
|
MOZ_ASSERT(!mTextureClient,
|
|
"This image already has allocated data");
|
|
|
|
mTextureClient = TextureClient::CreateForYCbCr(mCompositable->GetForwarder(),
|
|
aData.mYSize, aData.mCbCrSize,
|
|
aData.mStereoMode,
|
|
mCompositable->GetTextureFlags());
|
|
if (!mTextureClient) {
|
|
NS_WARNING("SharedPlanarYCbCrImage::Allocate failed.");
|
|
return false;
|
|
}
|
|
|
|
MappedYCbCrTextureData mapped;
|
|
// The locking here is sort of a lie. The SharedPlanarYCbCrImage just pulls
|
|
// pointers out of the TextureClient and keeps them around, which works only
|
|
// because the underlyin BufferTextureData is always mapped in memory even outside
|
|
// of the lock/unlock interval. That's sad and new code should follow this example.
|
|
if (!mTextureClient->Lock(OpenMode::OPEN_READ) || !mTextureClient->BorrowMappedYCbCrData(mapped)) {
|
|
MOZ_CRASH();
|
|
}
|
|
|
|
aData.mYChannel = mapped.y.data;
|
|
aData.mCbChannel = mapped.cb.data;
|
|
aData.mCrChannel = mapped.cr.data;
|
|
|
|
// copy some of aData's values in mData (most of them)
|
|
mData.mYChannel = aData.mYChannel;
|
|
mData.mCbChannel = aData.mCbChannel;
|
|
mData.mCrChannel = aData.mCrChannel;
|
|
mData.mYSize = aData.mYSize;
|
|
mData.mCbCrSize = aData.mCbCrSize;
|
|
mData.mPicX = aData.mPicX;
|
|
mData.mPicY = aData.mPicY;
|
|
mData.mPicSize = aData.mPicSize;
|
|
mData.mStereoMode = aData.mStereoMode;
|
|
// those members are not always equal to aData's, due to potentially different
|
|
// packing.
|
|
mData.mYSkip = 0;
|
|
mData.mCbSkip = 0;
|
|
mData.mCrSkip = 0;
|
|
mData.mYStride = mData.mYSize.width;
|
|
mData.mCbCrStride = mData.mCbCrSize.width;
|
|
|
|
// do not set mBuffer like in PlanarYCbCrImage because the later
|
|
// will try to manage this memory without knowing it belongs to a
|
|
// shmem.
|
|
mBufferSize = ImageDataSerializer::ComputeYCbCrBufferSize(mData.mYSize, mData.mCbCrSize);
|
|
mSize = mData.mPicSize;
|
|
|
|
mTextureClient->Unlock();
|
|
|
|
return mBufferSize > 0;
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|