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)
292 lines
8.1 KiB
C++
292 lines
8.1 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 "GrallocTextureHostBasic.h"
|
|
#include "GrallocImages.h" // for GetDataSourceSurfaceFrom()
|
|
#include "mozilla/layers/SharedBufferManagerParent.h"
|
|
|
|
#if ANDROID_VERSION >= 17
|
|
#include <ui/Fence.h>
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
static gfx::SurfaceFormat
|
|
HalFormatToSurfaceFormat(int aHalFormat, TextureFlags aFlags)
|
|
{
|
|
bool swapRB = bool(aFlags & TextureFlags::RB_SWAPPED);
|
|
switch (aHalFormat) {
|
|
case android::PIXEL_FORMAT_BGRA_8888:
|
|
return swapRB ? gfx::SurfaceFormat::R8G8B8A8 : gfx::SurfaceFormat::B8G8R8A8;
|
|
case android::PIXEL_FORMAT_RGBA_8888:
|
|
return swapRB ? gfx::SurfaceFormat::B8G8R8A8 : gfx::SurfaceFormat::R8G8B8A8;
|
|
case android::PIXEL_FORMAT_RGBX_8888:
|
|
return swapRB ? gfx::SurfaceFormat::B8G8R8X8 : gfx::SurfaceFormat::R8G8B8X8;
|
|
case android::PIXEL_FORMAT_RGB_565:
|
|
return gfx::SurfaceFormat::R5G6B5_UINT16;
|
|
case HAL_PIXEL_FORMAT_YCbCr_422_SP:
|
|
case HAL_PIXEL_FORMAT_YCrCb_420_SP:
|
|
case HAL_PIXEL_FORMAT_YCbCr_422_I:
|
|
case GrallocImage::HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
|
|
case GrallocImage::HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
|
|
case HAL_PIXEL_FORMAT_YV12:
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
|
|
#endif
|
|
// Needs convert to RGB565
|
|
return gfx::SurfaceFormat::R5G6B5_UINT16;
|
|
default:
|
|
if (aHalFormat >= 0x100 && aHalFormat <= 0x1FF) {
|
|
// Reserved range for HAL specific formats.
|
|
// Needs convert to RGB565
|
|
return gfx::SurfaceFormat::R5G6B5_UINT16;
|
|
} else {
|
|
MOZ_CRASH("GFX: Unhandled HAL pixel format");
|
|
return gfx::SurfaceFormat::UNKNOWN; // not reached
|
|
}
|
|
}
|
|
}
|
|
|
|
static bool
|
|
NeedsConvertFromYUVtoRGB565(int aHalFormat)
|
|
{
|
|
switch (aHalFormat) {
|
|
case android::PIXEL_FORMAT_BGRA_8888:
|
|
case android::PIXEL_FORMAT_RGBA_8888:
|
|
case android::PIXEL_FORMAT_RGBX_8888:
|
|
case android::PIXEL_FORMAT_RGB_565:
|
|
return false;
|
|
case HAL_PIXEL_FORMAT_YCbCr_422_SP:
|
|
case HAL_PIXEL_FORMAT_YCrCb_420_SP:
|
|
case HAL_PIXEL_FORMAT_YCbCr_422_I:
|
|
case GrallocImage::HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
|
|
case GrallocImage::HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
|
|
case HAL_PIXEL_FORMAT_YV12:
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
|
|
#endif
|
|
return true;
|
|
default:
|
|
if (aHalFormat >= 0x100 && aHalFormat <= 0x1FF) {
|
|
// Reserved range for HAL specific formats.
|
|
return true;
|
|
} else {
|
|
MOZ_CRASH("GFX: Unhandled HAL pixel format YUV");
|
|
return false; // not reached
|
|
}
|
|
}
|
|
}
|
|
|
|
GrallocTextureHostBasic::GrallocTextureHostBasic(
|
|
TextureFlags aFlags,
|
|
const NewSurfaceDescriptorGralloc& aDescriptor)
|
|
: TextureHost(aFlags)
|
|
, mGrallocHandle(aDescriptor)
|
|
, mSize(0, 0)
|
|
, mCropSize(0, 0)
|
|
, mFormat(gfx::SurfaceFormat::UNKNOWN)
|
|
, mIsOpaque(aDescriptor.isOpaque())
|
|
{
|
|
android::GraphicBuffer* grallocBuffer = GetGraphicBufferFromDesc(mGrallocHandle).get();
|
|
MOZ_ASSERT(grallocBuffer);
|
|
|
|
if (grallocBuffer) {
|
|
mFormat =
|
|
HalFormatToSurfaceFormat(grallocBuffer->getPixelFormat(),
|
|
aFlags & TextureFlags::RB_SWAPPED);
|
|
mSize = gfx::IntSize(grallocBuffer->getWidth(), grallocBuffer->getHeight());
|
|
mCropSize = mSize;
|
|
} else {
|
|
printf_stderr("gralloc buffer is nullptr\n");
|
|
}
|
|
}
|
|
|
|
bool
|
|
GrallocTextureHostBasic::Lock()
|
|
{
|
|
if (!mCompositor || !IsValid()) {
|
|
return false;
|
|
}
|
|
|
|
if (mTextureSource) {
|
|
return true;
|
|
}
|
|
|
|
android::sp<android::GraphicBuffer> graphicBuffer =
|
|
GetGraphicBufferFromDesc(mGrallocHandle);
|
|
MOZ_ASSERT(graphicBuffer.get());
|
|
|
|
RefPtr<gfx::DataSourceSurface> surf;
|
|
if (NeedsConvertFromYUVtoRGB565(graphicBuffer->getPixelFormat())) {
|
|
PlanarYCbCrData ycbcrData;
|
|
surf = GetDataSourceSurfaceFrom(graphicBuffer,
|
|
mCropSize,
|
|
ycbcrData);
|
|
} else {
|
|
uint32_t usage = GRALLOC_USAGE_SW_READ_OFTEN;
|
|
int32_t rv = graphicBuffer->lock(usage,
|
|
reinterpret_cast<void**>(&mMappedBuffer));
|
|
if (rv) {
|
|
mMappedBuffer = nullptr;
|
|
NS_WARNING("Couldn't lock graphic buffer");
|
|
return false;
|
|
}
|
|
surf = gfx::Factory::CreateWrappingDataSourceSurface(
|
|
mMappedBuffer,
|
|
graphicBuffer->getStride() * gfx::BytesPerPixel(mFormat),
|
|
mCropSize,
|
|
mFormat);
|
|
}
|
|
mTextureSource = mCompositor->CreateDataTextureSource(mFlags);
|
|
mTextureSource->Update(surf, nullptr);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
GrallocTextureHostBasic::IsValid() const
|
|
{
|
|
android::GraphicBuffer* graphicBuffer = GetGraphicBufferFromDesc(mGrallocHandle).get();
|
|
return graphicBuffer != nullptr;
|
|
}
|
|
|
|
bool
|
|
GrallocTextureHostBasic::BindTextureSource(CompositableTextureSourceRef& aTexture)
|
|
{
|
|
aTexture = mTextureSource;
|
|
return !!aTexture;
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::UnbindTextureSource()
|
|
{
|
|
ClearTextureSource();
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::ClearTextureSource()
|
|
{
|
|
mTextureSource = nullptr;
|
|
if (mMappedBuffer) {
|
|
android::GraphicBuffer* graphicBuffer = GetGraphicBufferFromDesc(mGrallocHandle).get();
|
|
MOZ_ASSERT(graphicBuffer);
|
|
mMappedBuffer = nullptr;
|
|
graphicBuffer->unlock();
|
|
}
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::SetCompositor(Compositor* aCompositor)
|
|
{
|
|
BasicCompositor* compositor = static_cast<BasicCompositor*>(aCompositor);
|
|
mCompositor = compositor;
|
|
if (mTextureSource) {
|
|
mTextureSource->SetCompositor(compositor);
|
|
}
|
|
}
|
|
|
|
gfx::SurfaceFormat
|
|
GrallocTextureHostBasic::GetFormat() const {
|
|
return mFormat;
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::WaitAcquireFenceHandleSyncComplete()
|
|
{
|
|
if (!mAcquireFenceHandle.IsValid()) {
|
|
return;
|
|
}
|
|
|
|
#if ANDROID_VERSION >= 17
|
|
RefPtr<FenceHandle::FdObj> fdObj = mAcquireFenceHandle.GetAndResetFdObj();
|
|
android::sp<android::Fence> fence(
|
|
new android::Fence(fdObj->GetAndResetFd()));
|
|
|
|
// Wait fece complete with timeout.
|
|
// If a source of the fence becomes invalid because of error,
|
|
// fene complete is not signaled. See Bug 1061435.
|
|
int rv = fence->wait(400 /*400 msec*/);
|
|
if (rv != android::OK) {
|
|
NS_ERROR("failed to wait fence complete");
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::SetCropRect(nsIntRect aCropRect)
|
|
{
|
|
MOZ_ASSERT(aCropRect.TopLeft() == gfx::IntPoint(0, 0));
|
|
MOZ_ASSERT(!aCropRect.IsEmpty());
|
|
MOZ_ASSERT(aCropRect.width <= mSize.width);
|
|
MOZ_ASSERT(aCropRect.height <= mSize.height);
|
|
|
|
gfx::IntSize cropSize(aCropRect.width, aCropRect.height);
|
|
if (mCropSize == cropSize) {
|
|
return;
|
|
}
|
|
|
|
mCropSize = cropSize;
|
|
ClearTextureSource();
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::DeallocateSharedData()
|
|
{
|
|
ClearTextureSource();
|
|
|
|
if (mGrallocHandle.buffer().type() != MaybeMagicGrallocBufferHandle::Tnull_t) {
|
|
MaybeMagicGrallocBufferHandle handle = mGrallocHandle.buffer();
|
|
base::ProcessId owner;
|
|
if (handle.type() == MaybeMagicGrallocBufferHandle::TGrallocBufferRef) {
|
|
owner = handle.get_GrallocBufferRef().mOwner;
|
|
}
|
|
else {
|
|
owner = handle.get_MagicGrallocBufferHandle().mRef.mOwner;
|
|
}
|
|
|
|
SharedBufferManagerParent::DropGrallocBuffer(owner, mGrallocHandle);
|
|
}
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::ForgetSharedData()
|
|
{
|
|
ClearTextureSource();
|
|
}
|
|
|
|
void
|
|
GrallocTextureHostBasic::DeallocateDeviceData()
|
|
{
|
|
ClearTextureSource();
|
|
}
|
|
|
|
LayerRenderState
|
|
GrallocTextureHostBasic::GetRenderState()
|
|
{
|
|
android::GraphicBuffer* graphicBuffer = GetGraphicBufferFromDesc(mGrallocHandle).get();
|
|
|
|
if (graphicBuffer) {
|
|
LayerRenderStateFlags flags = LayerRenderStateFlags::LAYER_RENDER_STATE_DEFAULT;
|
|
if (mIsOpaque) {
|
|
flags |= LayerRenderStateFlags::OPAQUE;
|
|
}
|
|
if (mFlags & TextureFlags::ORIGIN_BOTTOM_LEFT) {
|
|
flags |= LayerRenderStateFlags::ORIGIN_BOTTOM_LEFT;
|
|
}
|
|
if (mFlags & TextureFlags::RB_SWAPPED) {
|
|
flags |= LayerRenderStateFlags::FORMAT_RB_SWAP;
|
|
}
|
|
return LayerRenderState(graphicBuffer,
|
|
mCropSize,
|
|
flags,
|
|
this);
|
|
}
|
|
|
|
return LayerRenderState();
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|