mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
f5a7b27f3d
- Bug 1211204 - Remove possible false-negative with D3D9 texture memory reporting. r=mattwoodrow (74adbcad19)
- Bug 1200595 - D3D9 TextureData implementation. r=Bas (2624bd59a3)
- Bug 1200595 - MacIOSurface TextureData implementation. r=mattwoodrow (98130b5d6b)
- Bug 1200595 - EGLImage TextureData implementation. r=mattwoodrow (8b732af2da)
- Bug 1200595 - AndroidSurface TextureData implementation. r=mattwoodrow (79443ff5d7)
- Bug 1200595 - SharedSurface TextureData implementation. r=jgilbert (aadc8c5601)
- Bug 1200595 - DIB TextureData implementation. r=Bas (d7bae178ad)
- Bug 1200595 - Merge TextureClient and ClientTexture back into TextureClient. r=mattwoodrow (890d76ff9b)
- Bug 1200595 - Consolidate the TextureClient's destruction logic. r=mattwoodrow (fa9ac2e414)
- Allow asynchronous D3D11 TextureClients on the main thread. (bug 1217665 part 5, r=nical) (cb77fa88cc)
- Implement the direct bitmap drawing model for plugins. (bug 1217665 part 6, r=mattwoodrow) (82f9015e5a)
- Implement the direct DXGI drawing model for plugins. (bug 1217665 part 7, r=mattwoodrow) (cdeeb52a91)
- Implement the DidComposite NPAPI callback. (bug 1217665 part 8, r=mattwoodrow) (4eb2a790ae)
- Add an NPN_GetValue query to find the browser's DXGI adapter. (bug 1217665 part 10, r=aklotz,mattwoodrow) (84af4e525a)
- Create a D3D11 content device even if D2D is blocked. (bug 1217665 part 11, r=jrmuizel) (142441808e)
- Bug 1229665 - Convert widget clip regions to LayoutDevicePixels. r=botond. (edf746b278)
- Bug 1204715 - Move browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} to moz.build. r=mshal (8c6b4709bc)
- Bug 1212773 - Pass a base directory to jar maker, instead of a chrome directory. r=gps (1f644706c6)
- Bustage fix for bug 1210687 on a CLOSED TREE. r=me (4cd7000101)
- Bug 1212773 - Extend jar maker syntax for jar file location. r=gps (8119aa2b98)
- Bug 1164039 - moved TelemetryTimestamps.jsm and tests to toolkit/componets/telemetry/. r=dexter (942145656e)
- Bug 1184705 - Search A/B testing cohort identifier should be recorded in FHR, r=rnewman. (b5cf397cf0)
- Bug 1230047 (part 2) - Make several PaintWindow() functions use LayoutDevice coordinates. r=kats. (246e1321ca)
- Bug 1218454 - part 1 - move DialogValueHolder::Get out-of-line; r=bz (2d65438b37)
- Bug 1218454 - part 2 - don't #include nsContentUtils.h from CallbackObject.h; r=bz (59e3b60749)
- Bug 1205945 part.1 Remove unnecessary member of IMEInputHandler, mLastDispatchedCompositionString r=smichaud (2223df8aec)
- Bug 1205945 part.2 Add DispatchCompositionStartEvent() and move the code of OnStartIMEComposition() into it r=smichaud (25449c2bca)
- Bug 1205945 part.3 Move the code of OnUpdateIMEComposition() into DispatchCompositionChangeEvent() r=smichaud (e85a65f2f7)
- Bug 1205945 part.4 Move the code of OnEndIMEComposition() into DispatchCompositionCommitEvent() r=smichaud (21e6218c06)
- Bug 1205945 part.5 Emulate mSelectedRange at dispatching compositionchange or compositioncommit event until OnSelectionChange() is called r=smichaud (f82baaea8e)
- Bug 1205945 part.6 IMEInputHandler::GetAttributedSubstringFromRange() should return stored composition string if the range is in the composition string r=smichaud (53eabe028b)
- Bug 1205399 - Follow-up to fix build bustage for platforms without OS X 10.10 and -Wswitch enabled. r=mstange (c2e8eda9b5)
- Bug 1220337 - Don't show alternate notification actions on OS X 10.8. r=MattN (5ef8449dcc)
- Bug 1224738 - Fix alternate action index getter name on OS X. r=MattN (a6f83ce706)
- Bug 1225908 - AsmSimdTypeToLaneType. r=bbouvier (f850c10bff)
- Bug 1224389 - Odin: refactor types/signatures/values (r=bbouvier) (31bc615781)
- Bug 1224389 - Odin: simplify AsmJSModule global data allocation (r=bbouvier) (3ba518183a)
- Bug 1222684 - IonMonkey: MIPS: Implement callWithPatch and patchCall. r=luke (0ede7a61c3)
- Bug 1224814 - "TraceLogger: Remove redundant checks in BaselineJIT". r=hv1989 (b3865fbdf0)
- Bug 1228369: Rename CodeOffsetLabel into CodeOffset; r=luke (1d0aba3710)
- Bug 1224389 - Odin: refactor stubs, func-ptrs, and masm use (r=bbouvier) (2834725644)
- Bug 1228340: Get rid of the js_ prefix for CodeSpec, CodeName, NumCodeSpecs; r=jorendorff (8ff2b3bcd5)
- Bug 1176214 - Part 2: Preliminary adjustments. r=waldo (f9e2adca8a)
- Bug 1176214 - Part 3: VM core changes. r=waldo (cf5b24fe18)
- Bug 1176214 - Part 4: VM built-in lib changes. r=waldo (603335d2aa)
- Bug 1176214 - Part 5: Ion changes. r=h4writer (b589713e1c)
- Bug 1176214 - Part 6: Odin changes. r=luke (f1dcb025d2)
- Bug 1176214 - Part 7: Ctypes, shell, xpconnect, etc. r=waldo (bdc78e0558)
- Bug 1199578 - test case. r=waldo (6a94fd455a)
- Bug 1211409 - load/store exclusive for ARM-32. r=jolesen (38efc4882e)
- Bug 1205390 - guard against asm.js compilation not being available. r=me (aeefe98cfd)
- Make test runnable on non-Nightly (no bug) r=me (27930210ed)
- Bug 1176214 - Part 8: jit-test changes. r=bbouvier (31c4f42eea)
- Bug 1176214 - Part 9: tests changes. r=bbouvier (a245687f43)
- Bug 1176214 - Part 10: jsapi-tests changes. r=bbouvier (610e0002a2)
- bug 1198656 remove unnecessary reinterpret_casts r=padenot (bc5a67d521)
- bug 1198656 refactor acquiring the content into an object method r=padenot (b7b062fbf1)
- bug 1198656 clear references in mJSChannels on successful content acquire r=padenot (65e5ee1856)
- bug 1198656 delay AudioBuffer allocation until required r=padenot (57d0fd0d01)
- bug 1199559 remove now unused SetRawChannelContents r=padenot (40685ef783)
- Bug 1203616 - Properly scale the input buffer of a WaveShaperNode before processing it with the curve. r=karlt (12e9592a9e)
- Bug 1186343: Throw an InvalidStateError when we set the curve attribute of a WaveShaperNode with a Float32Array of length less than 2; r=padenot,smaug (df83b21fd0)
- bug 1188244 throw in SetCurve() on OOM r=padenot (17967b7b58)
- Bug 1176214 - Part 11: Changes to DOM, except for WebGL. r=bz, r=clb (c40e5c2a68)
- Bug 1176214 - Part 12: Changes to WebGL. r=bz, r=clb (228c90da3c)
- Bug 1176214 - Part 13: Changes to ipc. r=mrbkap (4b11d4e509)
- Bug 1176214 - Part 14: Changes to netwerk. r=jduell (91568c8444)
- Bug 1176214 - Part 15: Changes to xpcom. r=nfroyd (df8d080070)
- Revert "Bug 1176214 - Part 14: Changes to netwerk. r=jduell" (d0aedbac94)
- improved backport of PM because of newer JS_GetArrayBufferData (9d8188ff5e)
- bug 1199559 write decodeAudioData buffer in a format suitable for direct use by AudioBuffer r=padenot (da00bab1a1)
- bug 1225003 null-check mBuffer in SizeOfExcludingThis() r=padenot (c01d389f10)
- Bug 1225365 - Fix assertion in the nsScriptNameSpaceManager memory reporter. r=bz. (a5605a8923)
- Bug 1229458 - Remove SizeOfIncludingThisMustBeUnshared() from string classes. r=mccr8. (26abcea276)
- Bug 1214506. Ensure OggReader sets proper IDs for its tracks. r=jya (a270b02301)
- bits of Bug 1188812 - Obtain CDM can render capability and store into MediaInfo (321388180e)
- Bug 1226450 - Report audio/video codecs used in HTMLMediaElement and WebAudio via telemetry. r=jya (e722b409b7)
307 lines
8.5 KiB
C++
307 lines
8.5 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 "mozilla/layers/CompositableClient.h"
|
|
#include <stdint.h> // for uint64_t, uint32_t
|
|
#include "gfxPlatform.h" // for gfxPlatform
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "mozilla/layers/TextureClient.h" // for TextureClient, etc
|
|
#include "mozilla/layers/TextureClientOGL.h"
|
|
#include "mozilla/mozalloc.h" // for operator delete, etc
|
|
#include "mozilla/layers/PCompositableChild.h"
|
|
#ifdef XP_WIN
|
|
#include "gfxWindowsPlatform.h" // for gfxWindowsPlatform
|
|
#include "mozilla/layers/TextureD3D11.h"
|
|
#include "mozilla/layers/TextureD3D9.h"
|
|
#endif
|
|
#include "gfxUtils.h"
|
|
#include "IPDLActor.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
/**
|
|
* IPDL actor used by CompositableClient to match with its corresponding
|
|
* CompositableHost on the compositor side.
|
|
*
|
|
* CompositableChild is owned by a CompositableClient.
|
|
*/
|
|
class CompositableChild : public ChildActor<PCompositableChild>
|
|
, public AsyncTransactionTrackersHolder
|
|
{
|
|
public:
|
|
CompositableChild()
|
|
: mCompositableClient(nullptr), mAsyncID(0)
|
|
{
|
|
MOZ_COUNT_CTOR(CompositableChild);
|
|
}
|
|
|
|
virtual ~CompositableChild()
|
|
{
|
|
MOZ_COUNT_DTOR(CompositableChild);
|
|
}
|
|
|
|
virtual void ActorDestroy(ActorDestroyReason) override {
|
|
DestroyAsyncTransactionTrackersHolder();
|
|
if (mCompositableClient) {
|
|
mCompositableClient->mCompositableChild = nullptr;
|
|
}
|
|
}
|
|
|
|
CompositableClient* mCompositableClient;
|
|
|
|
uint64_t mAsyncID;
|
|
};
|
|
|
|
void
|
|
RemoveTextureFromCompositableTracker::ReleaseTextureClient()
|
|
{
|
|
if (mTextureClient &&
|
|
mTextureClient->GetAllocator() &&
|
|
!mTextureClient->GetAllocator()->IsImageBridgeChild())
|
|
{
|
|
TextureClientReleaseTask* task = new TextureClientReleaseTask(mTextureClient);
|
|
RefPtr<ISurfaceAllocator> allocator = mTextureClient->GetAllocator();
|
|
mTextureClient = nullptr;
|
|
allocator->GetMessageLoop()->PostTask(FROM_HERE, task);
|
|
} else {
|
|
mTextureClient = nullptr;
|
|
}
|
|
}
|
|
|
|
/* static */ void
|
|
CompositableClient::TransactionCompleteted(PCompositableChild* aActor, uint64_t aTransactionId)
|
|
{
|
|
CompositableChild* child = static_cast<CompositableChild*>(aActor);
|
|
child->TransactionCompleteted(aTransactionId);
|
|
}
|
|
|
|
/* static */ void
|
|
CompositableClient::HoldUntilComplete(PCompositableChild* aActor, AsyncTransactionTracker* aTracker)
|
|
{
|
|
CompositableChild* child = static_cast<CompositableChild*>(aActor);
|
|
child->HoldUntilComplete(aTracker);
|
|
}
|
|
|
|
/* static */ uint64_t
|
|
CompositableClient::GetTrackersHolderId(PCompositableChild* aActor)
|
|
{
|
|
CompositableChild* child = static_cast<CompositableChild*>(aActor);
|
|
return child->GetId();
|
|
}
|
|
|
|
/* static */ PCompositableChild*
|
|
CompositableClient::CreateIPDLActor()
|
|
{
|
|
return new CompositableChild();
|
|
}
|
|
|
|
/* static */ bool
|
|
CompositableClient::DestroyIPDLActor(PCompositableChild* actor)
|
|
{
|
|
delete actor;
|
|
return true;
|
|
}
|
|
|
|
void
|
|
CompositableClient::InitIPDLActor(PCompositableChild* aActor, uint64_t aAsyncID)
|
|
{
|
|
MOZ_ASSERT(aActor);
|
|
CompositableChild* child = static_cast<CompositableChild*>(aActor);
|
|
mCompositableChild = child;
|
|
child->mCompositableClient = this;
|
|
child->mAsyncID = aAsyncID;
|
|
}
|
|
|
|
/* static */ CompositableClient*
|
|
CompositableClient::FromIPDLActor(PCompositableChild* aActor)
|
|
{
|
|
MOZ_ASSERT(aActor);
|
|
return static_cast<CompositableChild*>(aActor)->mCompositableClient;
|
|
}
|
|
|
|
CompositableClient::CompositableClient(CompositableForwarder* aForwarder,
|
|
TextureFlags aTextureFlags)
|
|
: mCompositableChild(nullptr)
|
|
, mForwarder(aForwarder)
|
|
, mTextureFlags(aTextureFlags)
|
|
{
|
|
MOZ_COUNT_CTOR(CompositableClient);
|
|
}
|
|
|
|
CompositableClient::~CompositableClient()
|
|
{
|
|
MOZ_COUNT_DTOR(CompositableClient);
|
|
Destroy();
|
|
}
|
|
|
|
LayersBackend
|
|
CompositableClient::GetCompositorBackendType() const
|
|
{
|
|
return mForwarder->GetCompositorBackendType();
|
|
}
|
|
|
|
void
|
|
CompositableClient::SetIPDLActor(CompositableChild* aChild)
|
|
{
|
|
mCompositableChild = aChild;
|
|
}
|
|
|
|
PCompositableChild*
|
|
CompositableClient::GetIPDLActor() const
|
|
{
|
|
return mCompositableChild;
|
|
}
|
|
|
|
bool
|
|
CompositableClient::Connect(ImageContainer* aImageContainer)
|
|
{
|
|
MOZ_ASSERT(!mCompositableChild);
|
|
if (!GetForwarder() || GetIPDLActor()) {
|
|
return false;
|
|
}
|
|
GetForwarder()->Connect(this, aImageContainer);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
CompositableClient::IsConnected() const
|
|
{
|
|
return mCompositableChild && mCompositableChild->CanSend();
|
|
}
|
|
|
|
void
|
|
CompositableClient::Destroy()
|
|
{
|
|
if (!IsConnected()) {
|
|
return;
|
|
}
|
|
// Send pending AsyncMessages before deleting CompositableChild.
|
|
// They might have dependency to the mCompositableChild.
|
|
mForwarder->SendPendingAsyncMessges();
|
|
// Destroy CompositableChild.
|
|
mCompositableChild->mCompositableClient = nullptr;
|
|
mCompositableChild->Destroy();
|
|
mCompositableChild = nullptr;
|
|
}
|
|
|
|
uint64_t
|
|
CompositableClient::GetAsyncID() const
|
|
{
|
|
if (mCompositableChild) {
|
|
return mCompositableChild->mAsyncID;
|
|
}
|
|
return 0; // zero is always an invalid async ID
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
CompositableClient::CreateBufferTextureClient(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
gfx::BackendType aMoz2DBackend,
|
|
TextureFlags aTextureFlags)
|
|
{
|
|
return TextureClient::CreateForRawBufferAccess(GetForwarder(),
|
|
aFormat, aSize, aMoz2DBackend,
|
|
aTextureFlags | mTextureFlags);
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
CompositableClient::CreateTextureClientForDrawing(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
BackendSelector aSelector,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags aAllocFlags)
|
|
{
|
|
return TextureClient::CreateForDrawing(GetForwarder(),
|
|
aFormat, aSize, aSelector,
|
|
aTextureFlags | mTextureFlags,
|
|
aAllocFlags);
|
|
}
|
|
|
|
bool
|
|
CompositableClient::AddTextureClient(TextureClient* aClient)
|
|
{
|
|
if(!aClient) {
|
|
return false;
|
|
}
|
|
aClient->SetAddedToCompositableClient();
|
|
return aClient->InitIPDLActor(mForwarder);
|
|
}
|
|
|
|
void
|
|
CompositableClient::ClearCachedResources()
|
|
{
|
|
if (mTextureClientRecycler) {
|
|
mTextureClientRecycler = nullptr;
|
|
}
|
|
}
|
|
|
|
void
|
|
CompositableClient::RemoveTexture(TextureClient* aTexture)
|
|
{
|
|
mForwarder->RemoveTextureFromCompositable(this, aTexture);
|
|
}
|
|
|
|
TextureClientRecycleAllocator*
|
|
CompositableClient::GetTextureClientRecycler()
|
|
{
|
|
if (mTextureClientRecycler) {
|
|
return mTextureClientRecycler;
|
|
}
|
|
|
|
if (!mForwarder) {
|
|
return nullptr;
|
|
}
|
|
|
|
mTextureClientRecycler =
|
|
new layers::TextureClientRecycleAllocator(mForwarder);
|
|
return mTextureClientRecycler;
|
|
}
|
|
|
|
void
|
|
CompositableClient::DumpTextureClient(std::stringstream& aStream,
|
|
TextureClient* aTexture,
|
|
TextureDumpMode aCompress)
|
|
{
|
|
if (!aTexture) {
|
|
return;
|
|
}
|
|
RefPtr<gfx::DataSourceSurface> dSurf = aTexture->GetAsSurface();
|
|
if (!dSurf) {
|
|
return;
|
|
}
|
|
if (aCompress == TextureDumpMode::Compress) {
|
|
aStream << gfxUtils::GetAsLZ4Base64Str(dSurf).get();
|
|
} else {
|
|
aStream << gfxUtils::GetAsDataURI(dSurf).get();
|
|
}
|
|
}
|
|
|
|
AutoRemoveTexture::~AutoRemoveTexture()
|
|
{
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
if (mCompositable && mTexture && mCompositable->IsConnected()) {
|
|
// remove old buffer from CompositableHost
|
|
RefPtr<AsyncTransactionWaiter> waiter = new AsyncTransactionWaiter();
|
|
RefPtr<AsyncTransactionTracker> tracker =
|
|
new RemoveTextureFromCompositableTracker(waiter);
|
|
// Hold TextureClient until transaction complete.
|
|
tracker->SetTextureClient(mTexture);
|
|
mTexture->SetRemoveFromCompositableWaiter(waiter);
|
|
// RemoveTextureFromCompositableAsync() expects CompositorChild's presence.
|
|
mCompositable->GetForwarder()->RemoveTextureFromCompositableAsync(tracker, mCompositable, mTexture);
|
|
}
|
|
#else
|
|
if (mCompositable && mTexture) {
|
|
mCompositable->RemoveTexture(mTexture);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|