wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset fdaa0659fe13 (bug 863324) because of build bustage on a CLOSED TREE

Browse Source 
--HG--
rename : gfx/layers/ipc/PLayerTransaction.ipdl => gfx/layers/ipc/PLayers.ipdl
rename : gfx/layers/ipc/LayerTransactionChild.cpp => gfx/layers/ipc/ShadowLayersChild.cpp
rename : gfx/layers/ipc/LayerTransactionChild.h => gfx/layers/ipc/ShadowLayersChild.h
rename : gfx/layers/ipc/LayerTransactionParent.cpp => gfx/layers/ipc/ShadowLayersParent.cpp
rename : gfx/layers/ipc/LayerTransactionParent.h => gfx/layers/ipc/ShadowLayersParent.h
This commit is contained in:
Ehsan Akhgari 2013-04-22 18:12:15 -04:00
parent cb724a84c5
commit 34e21f4536
80 changed files with 243 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/ipc/TabChild.cpp
View File

@ -21,7 +21,7 @@
#include "mozilla/ipc/FileDescriptorUtils.h"
#include "mozilla/layers/AsyncPanZoomController.h"
#include "mozilla/layers/CompositorChild.h"
#include "mozilla/layers/PLayerTransactionChild.h"
#include "mozilla/layers/PLayersChild.h"
#include "mozilla/layout/RenderFrameChild.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/unused.h"
@ -2095,7 +2095,7 @@ TabChild::InitRenderingState()
return false;
}
PLayerTransactionChild* shadowManager = nullptr;
PLayersChild* shadowManager = nullptr;
if (id != 0) {
// Pushing layers transactions directly to a separate
// compositor context.
@ -2105,11 +2105,11 @@ TabChild::InitRenderingState()
return false;
}
shadowManager =
compositorChild->SendPLayerTransactionConstructor(textureFactoryIdentifier.mParentBackend,
id, &textureFactoryIdentifier);
compositorChild->SendPLayersConstructor(textureFactoryIdentifier.mParentBackend,
id, &textureFactoryIdentifier);
} else {
// Pushing transactions to the parent content.
shadowManager = remoteFrame->SendPLayerTransactionConstructor();
shadowManager = remoteFrame->SendPLayersConstructor();
}
if (!shadowManager) {

2
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@ -5,7 +5,7 @@
#include "base/basictypes.h"
/* This must occur *after* layers/PLayerTransaction.h to avoid typedefs conflicts. */
/* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "prmem.h"

2
gfx/layers/Layers.cpp
View File

@ -7,7 +7,7 @@
#include "mozilla/DebugOnly.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "mozilla/Telemetry.h"

4
gfx/layers/Makefile.in
View File

@ -114,9 +114,9 @@ CPPSRCS += \
ImageBridgeParent.cpp \
ShadowLayers.cpp \
ShadowLayerChild.cpp \
ShadowLayersChild.cpp \
ShadowLayerParent.cpp \
LayerTransactionChild.cpp \
LayerTransactionParent.cpp \
ShadowLayersParent.cpp \
SharedPlanarYCbCrImage.cpp \
ShmemYCbCrImage.cpp \
SharedRGBImage.cpp \

2
gfx/layers/basic/BasicCanvasLayer.cpp
View File

@ -3,7 +3,7 @@
* 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/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersParent.h"
#include "BasicCanvasLayer.h"
#include "gfxImageSurface.h"
#include "GLContext.h"

2
gfx/layers/basic/BasicColorLayer.cpp
View File

@ -3,7 +3,7 @@
* 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/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersParent.h"
#include "BasicLayersImpl.h"
using namespace mozilla::gfx;

2
gfx/layers/basic/BasicImageLayer.cpp
View File

@ -3,7 +3,7 @@
* 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/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersParent.h"
#include "BasicLayersImpl.h"
#include "SharedTextureImage.h"
#include "gfxUtils.h"

6
gfx/layers/basic/BasicLayerManager.cpp
View File

@ -6,8 +6,8 @@
#include "mozilla/dom/TabChild.h"
#include "mozilla/Hal.h"
#include "mozilla/layers/PLayerChild.h"
#include "mozilla/layers/PLayerTransactionChild.h"
#include "mozilla/layers/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersChild.h"
#include "mozilla/layers/PLayersParent.h"
#include "gfxSharedImageSurface.h"
#include "gfxImageSurface.h"
@ -1333,7 +1333,7 @@ void
BasicShadowLayerManager::ClearCachedResources(Layer* aSubtree)
{
MOZ_ASSERT(!HasShadowManager() || !aSubtree);
if (PLayerTransactionChild* manager = GetShadowManager()) {
if (PLayersChild* manager = GetShadowManager()) {
manager->SendClearCachedResources();
}
BasicLayerManager::ClearCachedResources(aSubtree);

2
gfx/layers/basic/BasicLayers.h
View File

@ -183,7 +183,7 @@ protected:
nsRefPtr<gfxContext> mTarget;
// When we're doing a transaction in order to draw to a non-default
// target, the layers transaction is only performed in order to send
// a PLayerTransaction:Update. We save the original non-default target to
// a PLayers:Update. We save the original non-default target to
// mShadowTarget, and then perform the transaction using
// mDummyTarget as the render target. After the transaction ends,
// we send a message to our remote side to capture the actual pixels

2
gfx/layers/basic/BasicLayersImpl.cpp
View File

@ -6,7 +6,7 @@
#include "mozilla/DebugOnly.h"
#include "BasicLayersImpl.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
using namespace mozilla::gfx;

2
gfx/layers/basic/BasicThebesLayer.h
View File

@ -6,7 +6,7 @@
#ifndef GFX_BASICTHEBESLAYER_H
#define GFX_BASICTHEBESLAYER_H
#include "mozilla/layers/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersParent.h"
#include "BasicLayersImpl.h"
#include "mozilla/layers/ContentClient.h"

2
gfx/layers/basic/BasicTiledThebesLayer.cpp
View File

@ -2,7 +2,7 @@
* 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/PLayerTransactionChild.h"
#include "mozilla/layers/PLayersChild.h"
#include "BasicTiledThebesLayer.h"
#include "gfxImageSurface.h"
#include "GeckoProfiler.h"

2
gfx/layers/client/CompositableClient.cpp
View File

@ -6,7 +6,7 @@
#include "mozilla/layers/CompositableClient.h"
#include "mozilla/layers/TextureClient.h"
#include "mozilla/layers/TextureClientOGL.h"
#include "mozilla/layers/LayerTransactionChild.h"
#include "mozilla/layers/ShadowLayersChild.h"
#include "mozilla/layers/CompositableForwarder.h"
namespace mozilla {

1
gfx/layers/client/CompositableClient.h
View File

@ -16,6 +16,7 @@ namespace layers {
class CompositableChild;
class CompositableClient;
class TextureClient;
class ShadowLayersChild;
class ImageBridgeChild;
class ShadowableLayer;
class CompositableForwarder;

2
gfx/layers/composite/CanvasLayerComposite.cpp
View File

@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo
#include "mozilla/layers/Effects.h"

2
gfx/layers/composite/ColorLayerComposite.h
View File

@ -6,7 +6,7 @@
#ifndef GFX_ColorLayerComposite_H
#define GFX_ColorLayerComposite_H
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "LayerManagerComposite.h"

4
gfx/layers/composite/CompositableHost.h
View File

@ -233,12 +233,12 @@ private:
* the layer.
*
* CompositableMap must be global because the image bridge doesn't have any
* reference to whatever we have created with PLayerTransaction. So, the only way to
* reference to whatever we have created with PLayers. So, the only way to
* actually connect these two worlds is to have something global that they can
* both query (in the same thread). The map is not allocated the map on the
* stack to avoid the badness of static initialization.
*
* Also, we have a compositor/PLayerTransaction protocol/etc. per layer manager, and the
* Also, we have a compositor/PLayers protocol/etc. per layer manager, and the
* ImageBridge is used by all the existing compositors that have a video, so
* there isn't an instance or "something" that lives outside the boudaries of a
* given layer manager on the compositor thread except the image bridge and the

2
gfx/layers/composite/ContainerLayerComposite.h
View File

@ -6,7 +6,7 @@
#ifndef GFX_ContainerLayerComposite_H
#define GFX_ContainerLayerComposite_H
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "Layers.h"

2
gfx/layers/composite/ImageLayerComposite.h
View File

@ -6,7 +6,7 @@
#ifndef GFX_ImageLayerComposite_H
#define GFX_ImageLayerComposite_H
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "LayerManagerComposite.h"

5
gfx/layers/composite/LayerManagerComposite.cpp
View File

@ -3,10 +3,9 @@
* 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/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
// This must occur *after* layers/PLayerTransaction.h to avoid
// typedefs conflicts.
/* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "LayerManagerComposite.h"

5
gfx/layers/composite/ThebesLayerComposite.cpp
View File

@ -4,11 +4,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "TiledLayerBuffer.h"
// This must occur *after* layers/PLayerTransaction.h to avoid
// typedefs conflicts.
/* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "mozilla/layers/ShadowLayers.h"

2
gfx/layers/composite/ThebesLayerComposite.h
View File

@ -6,7 +6,7 @@
#ifndef GFX_ThebesLayerComposite_H
#define GFX_ThebesLayerComposite_H
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "Layers.h"

5
gfx/layers/d3d10/ThebesLayerD3D10.cpp
View File

@ -3,10 +3,9 @@
* 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/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
// This must occur *after* layers/PLayerTransaction.h to avoid
// typedefs conflicts.
/* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "ThebesLayerD3D10.h"

2
gfx/layers/d3d9/CanvasLayerD3D9.cpp
View File

@ -5,7 +5,7 @@
#include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "gfxImageSurface.h"
#include "gfxWindowsSurface.h"

2
gfx/layers/d3d9/ImageLayerD3D9.cpp
View File

@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "gfxSharedImageSurface.h"
#include "ImageLayerD3D9.h"

5
gfx/layers/d3d9/ThebesLayerD3D9.cpp
View File

@ -3,10 +3,9 @@
* 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/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
// This must occur *after* layers/PLayerTransaction.h to avoid
// typedefs conflicts.
/* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "ipc/AutoOpenSurface.h"

2
gfx/layers/ipc/AutoOpenSurface.h
View File

@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "gfxASurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "ShadowLayers.h"
namespace mozilla {

22
gfx/layers/ipc/CompositorChild.cpp
View File

@ -7,9 +7,9 @@
#include "CompositorChild.h"
#include "CompositorParent.h"
#include "LayerManagerOGL.h"
#include "mozilla/layers/LayerTransactionChild.h"
#include "mozilla/layers/ShadowLayersChild.h"
using mozilla::layers::LayerTransactionChild;
using mozilla::layers::ShadowLayersChild;
namespace mozilla {
namespace layers {
@ -32,9 +32,9 @@ CompositorChild::Destroy()
{
mLayerManager->Destroy();
mLayerManager = NULL;
while (size_t len = ManagedPLayerTransactionChild().Length()) {
LayerTransactionChild* layers =
static_cast<LayerTransactionChild*>(ManagedPLayerTransactionChild()[len - 1]);
while (size_t len = ManagedPLayersChild().Length()) {
ShadowLayersChild* layers =
static_cast<ShadowLayersChild*>(ManagedPLayersChild()[len - 1]);
layers->Destroy();
}
SendStop();
@ -70,16 +70,16 @@ CompositorChild::Get()
return sCompositor;
}
PLayerTransactionChild*
CompositorChild::AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier*)
PLayersChild*
CompositorChild::AllocPLayers(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
{
return new LayerTransactionChild();
return new ShadowLayersChild();
}
bool
CompositorChild::DeallocPLayerTransaction(PLayerTransactionChild* actor)
CompositorChild::DeallocPLayers(PLayersChild* actor)
{
delete actor;
return true;

10
gfx/layers/ipc/CompositorChild.h
View File

@ -38,12 +38,10 @@ public:
static bool ChildProcessHasCompositor() { return sCompositor != nullptr; }
protected:
virtual PLayerTransactionChild*
AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
virtual bool DeallocPLayerTransaction(PLayerTransactionChild *aChild) MOZ_OVERRIDE;
virtual PLayersChild* AllocPLayers(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
virtual bool DeallocPLayers(PLayersChild *aChild) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;

52
gfx/layers/ipc/CompositorParent.cpp
View File

@ -24,7 +24,7 @@
#include "nsGkAtoms.h"
#include "nsIWidget.h"
#include "RenderTrace.h"
#include "LayerTransactionParent.h"
#include "ShadowLayersParent.h"
#include "BasicLayers.h"
#include "nsIWidget.h"
#include "nsGkAtoms.h"
@ -207,8 +207,8 @@ CompositorParent::~CompositorParent()
void
CompositorParent::Destroy()
{
NS_ABORT_IF_FALSE(ManagedPLayerTransactionParent().Length() == 0,
"CompositorParent destroyed before managed PLayerTransactionParent");
NS_ABORT_IF_FALSE(ManagedPLayersParent().Length() == 0,
"CompositorParent destroyed before managed PLayersParent");
// Ensure that the layer manager is destructed on the compositor thread.
mLayerManager = NULL;
@ -688,7 +688,7 @@ CompositorParent::TransformFixedLayers(Layer* aLayer,
static void
SetShadowProperties(Layer* aLayer)
{
// FIXME: Bug 717688 -- Do these updates in LayerTransactionParent::RecvUpdate.
// FIXME: Bug 717688 -- Do these updates in ShadowLayersParent::RecvUpdate.
ShadowLayer* shadow = aLayer->AsShadowLayer();
// Set the shadow's base transform to the layer's base transform.
shadow->SetShadowTransform(aLayer->GetBaseTransform());
@ -1037,7 +1037,7 @@ CompositorParent::TransformShadowTree(TimeStamp aCurrentFrame)
}
void
CompositorParent::ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
CompositorParent::ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
const TargetConfig& aTargetConfig,
bool isFirstPaint)
{
@ -1099,10 +1099,10 @@ CompositorParent::SyncViewportInfo(const nsIntRect& aDisplayPort,
#endif
}
PLayerTransactionParent*
CompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
PLayersParent*
CompositorParent::AllocPLayers(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
{
MOZ_ASSERT(aId == 0);
@ -1126,7 +1126,7 @@ CompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendHint,
}
*aTextureFactoryIdentifier = mLayerManager->GetTextureFactoryIdentifier();
return new LayerTransactionParent(mLayerManager, this, 0);
return new ShadowLayersParent(mLayerManager, this, 0);
// Basic layers compositor not yet implemented
/*} else if (aBackendHint == mozilla::layers::LAYERS_BASIC) {
nsRefPtr<LayerManager> layerManager = new BasicShadowLayerManager(mWidget);
@ -1137,7 +1137,7 @@ CompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendHint,
return NULL;
}
*aTextureFactoryIdentifier = layerManager->GetTextureFactoryIdentifier();
return new LayerTransactionParent(slm, this, 0); */
return new ShadowLayersParent(slm, this, 0); */
} else {
NS_ERROR("Unsupported backend selected for Async Compositor");
return NULL;
@ -1145,7 +1145,7 @@ CompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendHint,
}
bool
CompositorParent::DeallocPLayerTransaction(PLayerTransactionParent* actor)
CompositorParent::DeallocPLayers(PLayersParent* actor)
{
delete actor;
return true;
@ -1280,14 +1280,12 @@ public:
SurfaceDescriptor* aOutSnapshot)
{ return true; }
virtual PLayerTransactionParent*
AllocPLayerTransaction(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
virtual PLayersParent* AllocPLayers(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
virtual bool DeallocPLayers(PLayersParent* aLayers) MOZ_OVERRIDE;
virtual bool DeallocPLayerTransaction(PLayerTransactionParent* aLayers) MOZ_OVERRIDE;
virtual void ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
virtual void ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
const TargetConfig& aTargetConfig,
bool isFirstPaint) MOZ_OVERRIDE;
@ -1366,22 +1364,22 @@ CrossProcessCompositorParent::ActorDestroy(ActorDestroyReason aWhy)
NewRunnableMethod(this, &CrossProcessCompositorParent::DeferredDestroy));
}
PLayerTransactionParent*
CrossProcessCompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
PLayersParent*
CrossProcessCompositorParent::AllocPLayers(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
{
MOZ_ASSERT(aId != 0);
nsRefPtr<LayerManager> lm = sCurrentCompositor->GetLayerManager();
*aTextureFactoryIdentifier = lm->GetTextureFactoryIdentifier();
return new LayerTransactionParent(lm->AsShadowManager(), this, aId);
return new ShadowLayersParent(lm->AsShadowManager(), this, aId);
}
bool
CrossProcessCompositorParent::DeallocPLayerTransaction(PLayerTransactionParent* aLayers)
CrossProcessCompositorParent::DeallocPLayers(PLayersParent* aLayers)
{
LayerTransactionParent* slp = static_cast<LayerTransactionParent*>(aLayers);
ShadowLayersParent* slp = static_cast<ShadowLayersParent*>(aLayers);
RemoveIndirectTree(slp->GetId());
delete aLayers;
return true;
@ -1389,7 +1387,7 @@ CrossProcessCompositorParent::DeallocPLayerTransaction(PLayerTransactionParent*
void
CrossProcessCompositorParent::ShadowLayersUpdated(
LayerTransactionParent* aLayerTree,
ShadowLayersParent* aLayerTree,
const TargetConfig& aTargetConfig,
bool isFirstPaint)
{

13
gfx/layers/ipc/CompositorParent.h
View File

@ -16,7 +16,7 @@
//#define COMPOSITOR_PERFORMANCE_WARNING
#include "mozilla/layers/PCompositorParent.h"
#include "mozilla/layers/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersParent.h"
#include "base/thread.h"
#include "mozilla/Monitor.h"
#include "mozilla/TimeStamp.h"
@ -76,7 +76,7 @@ public:
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
virtual void ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
const TargetConfig& aTargetConfig,
bool isFirstPaint) MOZ_OVERRIDE;
/**
@ -168,11 +168,10 @@ public:
PlatformThreadId aThreadID);
protected:
virtual PLayerTransactionParent*
AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier);
virtual bool DeallocPLayerTransaction(PLayerTransactionParent* aLayers);
virtual PLayersParent* AllocPLayers(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier);
virtual bool DeallocPLayers(PLayersParent* aLayers);
virtual void ScheduleTask(CancelableTask*, int);
virtual void Composite();
virtual void ComposeToTarget(gfxContext* aTarget);

6
gfx/layers/ipc/PCompositable.ipdl
View File

@ -5,17 +5,17 @@
* 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 protocol PLayerTransaction;
include protocol PLayers;
include protocol PImageBridge;
include protocol PCompositor;
include "mozilla/layers/CompositorTypes.h";
include protocol PCompositor;
namespace mozilla {
namespace layers {
async protocol PCompositable
{
manager PImageBridge or PLayerTransaction;
manager PImageBridge or PLayers;
parent:
async __delete__();
};

10
gfx/layers/ipc/PCompositor.ipdl
View File

@ -7,7 +7,7 @@
include LayersSurfaces;
include protocol PGrallocBuffer;
include protocol PLayerTransaction;
include protocol PLayers;
include "mozilla/layers/CompositorTypes.h";
using mozilla::null_t;
@ -21,14 +21,14 @@ namespace layers {
/**
* The PCompositor protocol is used to manage communication between
* the main thread and the compositor thread context. It's primary
* purpose is to manage the PLayerTransaction sub protocol.
* purpose is to manage the PLayers sub protocol.
*/
// This should really be 'sync', but we're using 'rpc' as a workaround
// for Bug 716631.
rpc protocol PCompositor
{
// A Compositor manages a single Layer Manager (PLayerTransaction)
manages PLayerTransaction;
// A Compositor manages a single Layer Manager (PLayers)
manages PLayers;
parent:
@ -53,7 +53,7 @@ parent:
sync MakeSnapshot(SurfaceDescriptor inSnapshot)
returns (SurfaceDescriptor outSnapshot);
sync PLayerTransaction(LayersBackend layersBackendHint, uint64_t id)
sync PLayers(LayersBackend layersBackendHint, uint64_t id)
returns (TextureFactoryIdentifier textureFactoryIdentifier);
};

4
gfx/layers/ipc/PGrallocBuffer.ipdl
View File

@ -7,7 +7,7 @@
include protocol PCompositor;
include protocol PImageBridge;
include protocol PLayerTransaction;
include protocol PLayers;
namespace mozilla {
namespace layers {
@ -20,7 +20,7 @@ namespace layers {
*/
async protocol PGrallocBuffer {
// FIXME: Bug 783451: shouldn't be managed by PCompositor or PImageContainer
manager PImageBridge or PLayerTransaction;
manager PImageBridge or PLayers;
/** Gralloc buffers can be "owned" by either parent or child. */
both:

4
gfx/layers/ipc/PLayer.ipdl
View File

@ -5,7 +5,7 @@
* 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 protocol PLayerTransaction;
include protocol PLayers;
namespace mozilla {
namespace layers {
@ -15,7 +15,7 @@ namespace layers {
*/
async protocol PLayer {
manager PLayerTransaction;
manager PLayers;
/**
* OWNERSHIP MODEL

2
gfx/layers/ipc/PLayerTransaction.ipdl → gfx/layers/ipc/PLayers.ipdl
View File

@ -32,7 +32,7 @@ using mozilla::layers::TextureInfo;
namespace mozilla {
namespace layers {
sync protocol PLayerTransaction {
sync protocol PLayers {
manager PRenderFrame or PCompositor;
manages PLayer;
manages PCompositable;

4
gfx/layers/ipc/ShadowLayerParent.cpp
View File

@ -5,7 +5,7 @@
* 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 "LayerTransactionParent.h"
#include "ShadowLayersParent.h"
#include "ShadowLayerParent.h"
#include "ShadowLayers.h"
@ -68,7 +68,7 @@ ShadowLayerParent::ActorDestroy(ActorDestroyReason why)
break;
case FailedConstructor:
NS_RUNTIMEABORT("FailedConstructor isn't possible in PLayerTransaction");
NS_RUNTIMEABORT("FailedConstructor isn't possible in PLayers");
return; // unreached
}

1
gfx/layers/ipc/ShadowLayerParent.h
View File

@ -16,6 +16,7 @@ namespace layers {
class ContainerLayer;
class Layer;
class LayerManager;
class ShadowLayersParent;
class ShadowLayerParent : public PLayerParent
{

2
gfx/layers/ipc/ShadowLayerUtilsD3D10.cpp
View File

@ -8,7 +8,7 @@
#include <d3d10_1.h>
#include <dxgi.h>
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "ShadowLayers.h"
using namespace mozilla::gl;

2
gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
View File

@ -9,7 +9,7 @@
#include "mozilla/layers/PGrallocBufferChild.h"
#include "mozilla/layers/PGrallocBufferParent.h"
#include "mozilla/layers/PLayerTransactionChild.h"
#include "mozilla/layers/PLayersChild.h"
#include "mozilla/layers/ShadowLayers.h"
#include "mozilla/unused.h"
#include "nsXULAppAPI.h"

2
gfx/layers/ipc/ShadowLayerUtilsMac.cpp
View File

@ -5,7 +5,7 @@
* 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/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "gfxPlatform.h"

2
gfx/layers/ipc/ShadowLayerUtilsX11.cpp
View File

@ -5,7 +5,7 @@
* 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/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "gfxPlatform.h"

4
gfx/layers/ipc/ShadowLayers.cpp
View File

@ -14,8 +14,8 @@
#include "AutoOpenSurface.h"
#include "mozilla/ipc/SharedMemorySysV.h"
#include "mozilla/layers/PLayerChild.h"
#include "mozilla/layers/PLayerTransactionChild.h"
#include "mozilla/layers/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersChild.h"
#include "mozilla/layers/PLayersParent.h"
#include "mozilla/layers/LayerTransaction.h"
#include "mozilla/layers/LayersSurfaces.h"
#include "ShadowLayers.h"

14
gfx/layers/ipc/ShadowLayers.h
View File

@ -35,8 +35,8 @@ class Edit;
class EditReply;
class OptionalThebesBuffer;
class PLayerChild;
class PLayerTransactionChild;
class PLayerTransactionParent;
class PLayersChild;
class PLayersParent;
class ShadowableLayer;
class ShadowThebesLayer;
class ShadowContainerLayer;
@ -246,7 +246,7 @@ public:
/**
* Set aMaskLayer as the mask on aLayer.
* Note that only image layers are properly supported
* LayerTransactionParent::UpdateMask and accompanying ipdl
* ShadowLayersParent::UpdateMask and accompanying ipdl
* will need changing to update properties for other kinds
* of mask layer.
*/
@ -268,7 +268,7 @@ public:
* through ImageBridge, using an ID to connect the protocols on the
* compositor side.
*/
void AttachAsyncCompositable(PLayerTransactionChild* aLayer, uint64_t aID);
void AttachAsyncCompositable(PLayersChild* aLayer, uint64_t aID);
/**
* Communicate to the compositor that the texture identified by aLayer
@ -302,7 +302,7 @@ public:
/**
* Set an actor through which layer updates will be pushed.
*/
void SetShadowManager(PLayerTransactionChild* aShadowManager)
void SetShadowManager(PLayersChild* aShadowManager)
{
mShadowManager = aShadowManager;
}
@ -311,7 +311,7 @@ public:
* True if this is forwarding to a ShadowLayerManager.
*/
bool HasShadowManager() const { return !!mShadowManager; }
PLayerTransactionChild* GetShadowManager() const { return mShadowManager; }
PLayersChild* GetShadowManager() const { return mShadowManager; }
/**
* The following Alloc/Open/Destroy interfaces abstract over the
@ -374,7 +374,7 @@ public:
protected:
ShadowLayerForwarder();
PLayerTransactionChild* mShadowManager;
PLayersChild* mShadowManager;
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
virtual PGrallocBufferChild* AllocGrallocBuffer(const gfxIntSize& aSize,

22
gfx/layers/ipc/LayerTransactionChild.cpp → gfx/layers/ipc/ShadowLayersChild.cpp
View File

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ShadowLayerChild.h"
#include "LayerTransactionChild.h"
#include "ShadowLayersChild.h"
#include "ShadowLayerUtils.h"
#include "mozilla/layers/CompositableClient.h"
@ -14,16 +14,16 @@ namespace mozilla {
namespace layers {
void
LayerTransactionChild::Destroy()
ShadowLayersChild::Destroy()
{
NS_ABORT_IF_FALSE(0 == ManagedPLayerChild().Length(),
"layers should have been cleaned up by now");
PLayerTransactionChild::Send__delete__(this);
PLayersChild::Send__delete__(this);
// WARNING: |this| has gone to the great heap in the sky
}
PGrallocBufferChild*
LayerTransactionChild::AllocPGrallocBuffer(const gfxIntSize&,
ShadowLayersChild::AllocPGrallocBuffer(const gfxIntSize&,
const gfxContentType&,
MaybeMagicGrallocBufferHandle*)
{
@ -36,7 +36,7 @@ LayerTransactionChild::AllocPGrallocBuffer(const gfxIntSize&,
}
bool
LayerTransactionChild::DeallocPGrallocBuffer(PGrallocBufferChild* actor)
ShadowLayersChild::DeallocPGrallocBuffer(PGrallocBufferChild* actor)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
delete actor;
@ -48,7 +48,7 @@ LayerTransactionChild::DeallocPGrallocBuffer(PGrallocBufferChild* actor)
}
PLayerChild*
LayerTransactionChild::AllocPLayer()
ShadowLayersChild::AllocPLayer()
{
// we always use the "power-user" ctor
NS_RUNTIMEABORT("not reached");
@ -56,30 +56,30 @@ LayerTransactionChild::AllocPLayer()
}
bool
LayerTransactionChild::DeallocPLayer(PLayerChild* actor)
ShadowLayersChild::DeallocPLayer(PLayerChild* actor)
{
delete actor;
return true;
}
PCompositableChild*
LayerTransactionChild::AllocPCompositable(const TextureInfo& aInfo)
ShadowLayersChild::AllocPCompositable(const TextureInfo& aInfo)
{
return new CompositableChild();
}
bool
LayerTransactionChild::DeallocPCompositable(PCompositableChild* actor)
ShadowLayersChild::DeallocPCompositable(PCompositableChild* actor)
{
delete actor;
return true;
}
void
LayerTransactionChild::ActorDestroy(ActorDestroyReason why)
ShadowLayersChild::ActorDestroy(ActorDestroyReason why)
{
if (why == AbnormalShutdown) {
NS_RUNTIMEABORT("ActorDestroy by IPC channel failure at LayerTransactionChild");
NS_RUNTIMEABORT("ActorDestroy by IPC channel failure at ShadowLayersChild");
}
}

14
gfx/layers/ipc/LayerTransactionChild.h → gfx/layers/ipc/ShadowLayersChild.h
View File

@ -5,19 +5,19 @@
* 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/. */
#ifndef MOZILLA_LAYERS_LAYERTRANSACTIONCHILD_H
#define MOZILLA_LAYERS_LAYERTRANSACTIONCHILD_H
#ifndef mozilla_layers_ShadowLayersChild_h
#define mozilla_layers_ShadowLayersChild_h
#include "mozilla/layers/PLayerTransactionChild.h"
#include "mozilla/layers/PLayersChild.h"
namespace mozilla {
namespace layers {
class LayerTransactionChild : public PLayerTransactionChild
class ShadowLayersChild : public PLayersChild
{
public:
LayerTransactionChild() { }
~LayerTransactionChild() { }
ShadowLayersChild() { }
~ShadowLayersChild() { }
/**
* Clean this up, finishing with Send__delete__().
@ -46,4 +46,4 @@ protected:
} // namespace layers
} // namespace mozilla
#endif // MOZILLA_LAYERS_LAYERTRANSACTIONCHILD_H
#endif // ifndef mozilla_layers_ShadowLayersChild_h

4
gfx/layers/ipc/ShadowLayersManager.h
View File

@ -11,12 +11,12 @@ namespace mozilla {
namespace layers {
class TargetConfig;
class LayerTransactionParent;
class ShadowLayersParent;
class ShadowLayersManager
{
public:
virtual void ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
virtual void ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
const TargetConfig& aTargetConfig,
bool isFirstPaint) = 0;
};

52
gfx/layers/ipc/LayerTransactionParent.cpp → gfx/layers/ipc/ShadowLayersParent.cpp
View File

@ -15,7 +15,7 @@
#include "mozilla/unused.h"
#include "RenderTrace.h"
#include "ShadowLayerParent.h"
#include "LayerTransactionParent.h"
#include "ShadowLayersParent.h"
#include "ShadowLayers.h"
#include "ShadowLayerUtils.h"
#include "TiledLayerBuffer.h"
@ -124,25 +124,25 @@ ShadowChild(const OpRaiseToTopChild& op)
}
//--------------------------------------------------
// LayerTransactionParent
LayerTransactionParent::LayerTransactionParent(ShadowLayerManager* aManager,
ShadowLayersManager* aLayersManager,
uint64_t aId)
// ShadowLayersParent
ShadowLayersParent::ShadowLayersParent(ShadowLayerManager* aManager,
ShadowLayersManager* aLayersManager,
uint64_t aId)
: mLayerManager(aManager)
, mShadowLayersManager(aLayersManager)
, mId(aId)
, mDestroyed(false)
{
MOZ_COUNT_CTOR(LayerTransactionParent);
MOZ_COUNT_CTOR(ShadowLayersParent);
}
LayerTransactionParent::~LayerTransactionParent()
ShadowLayersParent::~ShadowLayersParent()
{
MOZ_COUNT_DTOR(LayerTransactionParent);
MOZ_COUNT_DTOR(ShadowLayersParent);
}
void
LayerTransactionParent::Destroy()
ShadowLayersParent::Destroy()
{
mDestroyed = true;
for (size_t i = 0; i < ManagedPLayerParent().Length(); ++i) {
@ -154,18 +154,18 @@ LayerTransactionParent::Destroy()
/* virtual */
bool
LayerTransactionParent::RecvUpdateNoSwap(const InfallibleTArray<Edit>& cset,
const TargetConfig& targetConfig,
const bool& isFirstPaint)
ShadowLayersParent::RecvUpdateNoSwap(const InfallibleTArray<Edit>& cset,
const TargetConfig& targetConfig,
const bool& isFirstPaint)
{
return RecvUpdate(cset, targetConfig, isFirstPaint, nullptr);
}
bool
LayerTransactionParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
const TargetConfig& targetConfig,
const bool& isFirstPaint,
InfallibleTArray<EditReply>* reply)
ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
const TargetConfig& targetConfig,
const bool& isFirstPaint,
InfallibleTArray<EditReply>* reply)
{
#ifdef COMPOSITOR_PERFORMANCE_WARNING
TimeStamp updateStart = TimeStamp::Now();
@ -421,7 +421,7 @@ LayerTransactionParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
}
void
LayerTransactionParent::Attach(ShadowLayerParent* aLayerParent, CompositableParent* aCompositable)
ShadowLayersParent::Attach(ShadowLayerParent* aLayerParent, CompositableParent* aCompositable)
{
ShadowLayer* layer = aLayerParent->AsLayer()->AsShadowLayer();
MOZ_ASSERT(layer);
@ -437,7 +437,7 @@ LayerTransactionParent::Attach(ShadowLayerParent* aLayerParent, CompositablePare
}
bool
LayerTransactionParent::RecvClearCachedResources()
ShadowLayersParent::RecvClearCachedResources()
{
if (mRoot) {
// NB: |mRoot| here is the *child* context's root. In this parent
@ -449,9 +449,9 @@ LayerTransactionParent::RecvClearCachedResources()
}
PGrallocBufferParent*
LayerTransactionParent::AllocPGrallocBuffer(const gfxIntSize& aSize,
const gfxContentType& aContent,
MaybeMagicGrallocBufferHandle* aOutHandle)
ShadowLayersParent::AllocPGrallocBuffer(const gfxIntSize& aSize,
const gfxContentType& aContent,
MaybeMagicGrallocBufferHandle* aOutHandle)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
return GrallocBufferActor::Create(aSize, aContent, aOutHandle);
@ -462,7 +462,7 @@ LayerTransactionParent::AllocPGrallocBuffer(const gfxIntSize& aSize,
}
bool
LayerTransactionParent::DeallocPGrallocBuffer(PGrallocBufferParent* actor)
ShadowLayersParent::DeallocPGrallocBuffer(PGrallocBufferParent* actor)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
delete actor;
@ -474,26 +474,26 @@ LayerTransactionParent::DeallocPGrallocBuffer(PGrallocBufferParent* actor)
}
PLayerParent*
LayerTransactionParent::AllocPLayer()
ShadowLayersParent::AllocPLayer()
{
return new ShadowLayerParent();
}
bool
LayerTransactionParent::DeallocPLayer(PLayerParent* actor)
ShadowLayersParent::DeallocPLayer(PLayerParent* actor)
{
delete actor;
return true;
}
PCompositableParent*
LayerTransactionParent::AllocPCompositable(const TextureInfo& aInfo)
ShadowLayersParent::AllocPCompositable(const TextureInfo& aInfo)
{
return new CompositableParent(this, aInfo);
}
bool
LayerTransactionParent::DeallocPCompositable(PCompositableParent* actor)
ShadowLayersParent::DeallocPCompositable(PCompositableParent* actor)
{
delete actor;
return true;

26
gfx/layers/ipc/LayerTransactionParent.h → gfx/layers/ipc/ShadowLayersParent.h
View File

@ -5,10 +5,10 @@
* 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/. */
#ifndef MOZILLA_LAYERS_LAYERTRANSACTIONPARENT_H
#define MOZILLA_LAYERS_LAYERTRANSACTIONPARENT_H
#ifndef mozilla_layers_ShadowLayersParent_h
#define mozilla_layers_ShadowLayersParent_h
#include "mozilla/layers/PLayerTransactionParent.h"
#include "mozilla/layers/PLayersParent.h"
#include "ShadowLayers.h"
#include "ShadowLayersManager.h"
#include "CompositableTransactionParent.h"
@ -26,18 +26,18 @@ class ShadowLayerManager;
class ShadowLayerParent;
class CompositableParent;
class LayerTransactionParent : public PLayerTransactionParent,
public CompositableParentManager
class ShadowLayersParent : public PLayersParent,
public CompositableParentManager
{
typedef mozilla::layout::RenderFrameParent RenderFrameParent;
typedef InfallibleTArray<Edit> EditArray;
typedef InfallibleTArray<EditReply> EditReplyArray;
public:
LayerTransactionParent(ShadowLayerManager* aManager,
ShadowLayersManager* aLayersManager,
uint64_t aId);
~LayerTransactionParent();
ShadowLayersParent(ShadowLayerManager* aManager,
ShadowLayersManager* aLayersManager,
uint64_t aId);
~ShadowLayersParent();
void Destroy();
@ -50,18 +50,18 @@ public:
virtual bool AllocShmem(size_t aSize,
ipc::SharedMemory::SharedMemoryType aType,
ipc::Shmem* aShmem) {
return PLayerTransactionParent::AllocShmem(aSize, aType, aShmem);
return PLayersParent::AllocShmem(aSize, aType, aShmem);
}
virtual bool AllocUnsafeShmem(size_t aSize,
ipc::SharedMemory::SharedMemoryType aType,
ipc::Shmem* aShmem) {
return PLayerTransactionParent::AllocUnsafeShmem(aSize, aType, aShmem);
return PLayersParent::AllocUnsafeShmem(aSize, aType, aShmem);
}
virtual void DeallocShmem(ipc::Shmem& aShmem) MOZ_OVERRIDE
{
PLayerTransactionParent::DeallocShmem(aShmem);
PLayersParent::DeallocShmem(aShmem);
}
@ -121,4 +121,4 @@ private:
} // namespace layers
} // namespace mozilla
#endif // MOZILLA_LAYERS_LAYERTRANSACTIONPARENT_H
#endif // ifndef mozilla_layers_ShadowLayersParent_h

2
gfx/layers/ipc/ipdl.mk
View File

@ -10,5 +10,5 @@ IPDLSRCS = \
PGrallocBuffer.ipdl \
PImageBridge.ipdl \
PLayer.ipdl \
PLayerTransaction.ipdl \
PLayers.ipdl \
$(NULL)

4
gfx/layers/moz.build
View File

@ -84,8 +84,8 @@ EXPORTS.mozilla.layers += [
'ISurfaceAllocator.h',
'LayersTypes.h',
'ShadowLayers.h',
'LayerTransactionChild.h',
'LayerTransactionParent.h',
'ShadowLayersChild.h',
'ShadowLayersParent.h',
'ShadowLayersManager.h',
'RenderTrace.h',
'SharedRGBImage.h',

2
gfx/layers/opengl/CanvasLayerOGL.cpp
View File

@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "gfxSharedImageSurface.h"

2
gfx/layers/opengl/ColorLayerOGL.h
View File

@ -6,7 +6,7 @@
#ifndef GFX_COLORLAYEROGL_H
#define GFX_COLORLAYEROGL_H
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "LayerManagerOGL.h"

2
gfx/layers/opengl/ImageLayerOGL.h
View File

@ -6,7 +6,7 @@
#ifndef GFX_IMAGELAYEROGL_H
#define GFX_IMAGELAYEROGL_H
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "LayerManagerOGL.h"
#include "ImageLayers.h"

4
gfx/layers/opengl/LayerManagerOGL.cpp
View File

@ -5,10 +5,10 @@
#include "LayerManagerOGL.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include <algorithm>
/* This must occur *after* layers/PLayerTransaction.h to avoid typedefs conflicts. */
/* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "Composer2D.h"

4
gfx/layers/opengl/ThebesLayerOGL.cpp
View File

@ -4,10 +4,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "TiledLayerBuffer.h"
/* This must occur *after* layers/PLayerTransaction.h to avoid typedefs conflicts. */
/* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "ThebesLayerBuffer.h"

2
layout/base/nsDisplayList.cpp
View File

@ -15,7 +15,7 @@
#include "mozilla/dom/PBrowserChild.h"
#include "mozilla/dom/TabChild.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "nsDisplayList.h"

8
layout/ipc/PRenderFrame.ipdl
View File

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
include protocol PBrowser;
include protocol PLayerTransaction;
include protocol PLayers;
namespace mozilla {
namespace layout {
@ -23,7 +23,7 @@ namespace layout {
sync protocol PRenderFrame
{
manager PBrowser;
manages PLayerTransaction;
manages PLayers;
parent:
/**
@ -37,7 +37,7 @@ parent:
* |id| is set to 0 in the "direct" case, and to a whole number
* in the "indirect" case.
*/
async PLayerTransaction();
async PLayers();
async NotifyCompositorTransaction();
@ -47,7 +47,7 @@ parent:
async __delete__();
state EMPTY_OR_DIRECT_COMPOSITOR:
recv PLayerTransaction goto HAVE_CONTENT;
recv PLayers goto HAVE_CONTENT;
recv NotifyCompositorTransaction goto EMPTY_OR_DIRECT_COMPOSITOR;
recv __delete__;

20
layout/ipc/RenderFrameChild.cpp
View File

@ -6,10 +6,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "RenderFrameChild.h"
#include "mozilla/layers/LayerTransactionChild.h"
#include "mozilla/layers/ShadowLayersChild.h"
using mozilla::layers::PLayerTransactionChild;
using mozilla::layers::LayerTransactionChild;
using mozilla::layers::PLayersChild;
using mozilla::layers::ShadowLayersChild;
namespace mozilla {
namespace layout {
@ -17,13 +17,13 @@ namespace layout {
void
RenderFrameChild::Destroy()
{
size_t numChildren = ManagedPLayerTransactionChild().Length();
size_t numChildren = ManagedPLayersChild().Length();
NS_ABORT_IF_FALSE(0 == numChildren || 1 == numChildren,
"render frame must only have 0 or 1 layer forwarder");
if (numChildren) {
LayerTransactionChild* layers =
static_cast<LayerTransactionChild*>(ManagedPLayerTransactionChild()[0]);
ShadowLayersChild* layers =
static_cast<ShadowLayersChild*>(ManagedPLayersChild()[0]);
layers->Destroy();
// |layers| was just deleted, take care
}
@ -44,14 +44,14 @@ RenderFrameChild::DetectScrollableSubframe()
SendDetectScrollableSubframe();
}
PLayerTransactionChild*
RenderFrameChild::AllocPLayerTransaction()
PLayersChild*
RenderFrameChild::AllocPLayers()
{
return new LayerTransactionChild();
return new ShadowLayersChild();
}
bool
RenderFrameChild::DeallocPLayerTransaction(PLayerTransactionChild* aLayers)
RenderFrameChild::DeallocPLayers(PLayersChild* aLayers)
{
delete aLayers;
return true;

4
layout/ipc/RenderFrameChild.h
View File

@ -25,8 +25,8 @@ public:
void Destroy();
protected:
virtual PLayerTransactionChild* AllocPLayerTransaction() MOZ_OVERRIDE;
virtual bool DeallocPLayerTransaction(PLayerTransactionChild* aLayers) MOZ_OVERRIDE;
virtual PLayersChild* AllocPLayers() MOZ_OVERRIDE;
virtual bool DeallocPLayers(PLayersChild* aLayers) MOZ_OVERRIDE;
};
} // namespace layout

28
layout/ipc/RenderFrameParent.cpp
View File

@ -17,7 +17,7 @@
#include "mozilla/dom/TabParent.h"
#include "mozilla/layers/AsyncPanZoomController.h"
#include "mozilla/layers/CompositorParent.h"
#include "mozilla/layers/LayerTransactionParent.h"
#include "mozilla/layers/ShadowLayersParent.h"
#include "nsContentUtils.h"
#include "nsFrameLoader.h"
#include "nsIObserver.h"
@ -629,13 +629,13 @@ RenderFrameParent::~RenderFrameParent()
void
RenderFrameParent::Destroy()
{
size_t numChildren = ManagedPLayerTransactionParent().Length();
size_t numChildren = ManagedPLayersParent().Length();
NS_ABORT_IF_FALSE(0 == numChildren || 1 == numChildren,
"render frame must only have 0 or 1 layer manager");
if (numChildren) {
LayerTransactionParent* layers =
static_cast<LayerTransactionParent*>(ManagedPLayerTransactionParent()[0]);
ShadowLayersParent* layers =
static_cast<ShadowLayersParent*>(ManagedPLayersParent()[0]);
layers->Destroy();
}
@ -657,7 +657,7 @@ RenderFrameParent::ContentViewScaleChanged(nsContentView* aView)
}
void
RenderFrameParent::ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
RenderFrameParent::ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
const TargetConfig& aTargetConfig,
bool isFirstPaint)
{
@ -846,18 +846,18 @@ RenderFrameParent::RecvDetectScrollableSubframe()
return true;
}
PLayerTransactionParent*
RenderFrameParent::AllocPLayerTransaction()
PLayersParent*
RenderFrameParent::AllocPLayers()
{
if (!mFrameLoader || mFrameLoaderDestroyed) {
return nullptr;
}
nsRefPtr<LayerManager> lm = GetFrom(mFrameLoader);
return new LayerTransactionParent(lm->AsShadowManager(), this, 0);
return new ShadowLayersParent(lm->AsShadowManager(), this, 0);
}
bool
RenderFrameParent::DeallocPLayerTransaction(PLayerTransactionParent* aLayers)
RenderFrameParent::DeallocPLayers(PLayersParent* aLayers)
{
delete aLayers;
return true;
@ -915,14 +915,14 @@ RenderFrameParent::TriggerRepaint()
docFrame->SchedulePaint();
}
LayerTransactionParent*
ShadowLayersParent*
RenderFrameParent::GetShadowLayers() const
{
const InfallibleTArray<PLayerTransactionParent*>& shadowParents = ManagedPLayerTransactionParent();
const InfallibleTArray<PLayersParent*>& shadowParents = ManagedPLayersParent();
NS_ABORT_IF_FALSE(shadowParents.Length() <= 1,
"can only support at most 1 LayerTransactionParent");
"can only support at most 1 ShadowLayersParent");
return (shadowParents.Length() == 1) ?
static_cast<LayerTransactionParent*>(shadowParents[0]) : nullptr;
static_cast<ShadowLayersParent*>(shadowParents[0]) : nullptr;
}
uint64_t
@ -934,7 +934,7 @@ RenderFrameParent::GetLayerTreeId() const
ContainerLayer*
RenderFrameParent::GetRootLayer() const
{
LayerTransactionParent* shadowLayers = GetShadowLayers();
ShadowLayersParent* shadowLayers = GetShadowLayers();
return shadowLayers ? shadowLayers->GetRoot() : nullptr;
}

12
layout/ipc/RenderFrameParent.h
View File

@ -28,7 +28,7 @@ namespace layers {
class AsyncPanZoomController;
class GestureEventListener;
class TargetConfig;
class LayerTransactionParent;
class ShadowLayersParent;
struct TextureFactoryIdentifier;
}
@ -44,7 +44,7 @@ class RenderFrameParent : public PRenderFrameParent,
typedef mozilla::layers::Layer Layer;
typedef mozilla::layers::LayerManager LayerManager;
typedef mozilla::layers::TargetConfig TargetConfig;
typedef mozilla::layers::LayerTransactionParent LayerTransactionParent;
typedef mozilla::layers::ShadowLayersParent ShadowLayersParent;
typedef mozilla::FrameLayerBuilder::ContainerParameters ContainerParameters;
typedef mozilla::layers::TextureFactoryIdentifier TextureFactoryIdentifier;
typedef FrameMetrics::ViewID ViewID;
@ -73,7 +73,7 @@ public:
void ContentViewScaleChanged(nsContentView* aView);
virtual void ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
virtual void ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
const TargetConfig& aTargetConfig,
bool isFirstPaint) MOZ_OVERRIDE;
@ -112,15 +112,15 @@ protected:
virtual bool RecvCancelDefaultPanZoom() MOZ_OVERRIDE;
virtual bool RecvDetectScrollableSubframe() MOZ_OVERRIDE;
virtual PLayerTransactionParent* AllocPLayerTransaction() MOZ_OVERRIDE;
virtual bool DeallocPLayerTransaction(PLayerTransactionParent* aLayers) MOZ_OVERRIDE;
virtual PLayersParent* AllocPLayers() MOZ_OVERRIDE;
virtual bool DeallocPLayers(PLayersParent* aLayers) MOZ_OVERRIDE;
private:
void BuildViewMap();
void TriggerRepaint();
void DispatchEventForPanZoomController(const InputEvent& aEvent);
LayerTransactionParent* GetShadowLayers() const;
ShadowLayersParent* GetShadowLayers() const;
uint64_t GetLayerTreeId() const;
ContainerLayer* GetRootLayer() const;

2
widget/android/nsWindow.cpp
View File

@ -683,7 +683,7 @@ nsWindow::SetWindowClass(const nsAString& xulWinType)
}
mozilla::layers::LayerManager*
nsWindow::GetLayerManager(PLayerTransactionChild*, LayersBackend, LayerManagerPersistence,
nsWindow::GetLayerManager(PLayersChild*, LayersBackend, LayerManagerPersistence,
bool* aAllowRetaining)
{
if (aAllowRetaining) {

2
widget/android/nsWindow.h
View File

@ -135,7 +135,7 @@ public:
uint32_t aNewEnd) MOZ_OVERRIDE;
virtual nsIMEUpdatePreference GetIMEUpdatePreference();
LayerManager* GetLayerManager (PLayerTransactionChild* aShadowManager = nullptr,
LayerManager* GetLayerManager (PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);

2
widget/cocoa/nsCocoaWindow.h
View File

@ -255,7 +255,7 @@ public:
NS_IMETHOD Invalidate(const nsIntRect &aRect);
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
virtual LayerManager* GetLayerManager(PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);

2
widget/cocoa/nsCocoaWindow.mm
View File

@ -993,7 +993,7 @@ nsCocoaWindow::ConfigureChildren(const nsTArray<Configuration>& aConfigurations)
}
LayerManager*
nsCocoaWindow::GetLayerManager(PLayerTransactionChild* aShadowManager,
nsCocoaWindow::GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence,
bool* aAllowRetaining)

2
widget/gonk/HwcComposer2D.cpp
View File

@ -19,7 +19,7 @@
#include "Framebuffer.h"
#include "HwcComposer2D.h"
#include "LayerManagerOGL.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/PLayers.h"
#include "mozilla/layers/ShadowLayerUtilsGralloc.h"
#include "mozilla/StaticPtr.h"
#include "cutils/properties.h"

2
widget/gonk/nsWindow.cpp
View File

@ -539,7 +539,7 @@ nsWindow::GetDPI()
}
LayerManager *
nsWindow::GetLayerManager(PLayerTransactionChild* aShadowManager,
nsWindow::GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence,
bool* aAllowRetaining)

2
widget/gonk/nsWindow.h
View File

@ -94,7 +94,7 @@ public:
virtual float GetDPI();
virtual mozilla::layers::LayerManager*
GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
GetLayerManager(PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);

2
widget/gtk2/nsWindow.cpp
View File

@ -6164,7 +6164,7 @@ nsWindow::BeginResizeDrag(nsGUIEvent* aEvent, int32_t aHorizontal, int32_t aVert
}
nsIWidget::LayerManager*
nsWindow::GetLayerManager(PLayerTransactionChild* aShadowManager,
nsWindow::GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence,
bool* aAllowRetaining)

2
widget/gtk2/nsWindow.h
View File

@ -430,7 +430,7 @@ private:
void DispatchMissedButtonReleases(GdkEventCrossing *aGdkEvent);
// nsBaseWidget
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
virtual LayerManager* GetLayerManager(PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr) MOZ_OVERRIDE;

6
widget/nsIWidget.h
View File

@ -45,7 +45,7 @@ namespace layers {
class Composer2D;
class CompositorChild;
class LayerManager;
class PLayerTransactionChild;
class PLayersChild;
}
}
@ -419,7 +419,7 @@ class nsIWidget : public nsISupports {
typedef mozilla::layers::CompositorChild CompositorChild;
typedef mozilla::layers::LayerManager LayerManager;
typedef mozilla::layers::LayersBackend LayersBackend;
typedef mozilla::layers::PLayerTransactionChild PLayerTransactionChild;
typedef mozilla::layers::PLayersChild PLayersChild;
typedef mozilla::widget::NotificationToIME NotificationToIME;
typedef mozilla::widget::IMEState IMEState;
typedef mozilla::widget::InputContext InputContext;
@ -1148,7 +1148,7 @@ class nsIWidget : public nsISupports {
* type |aBackendHint| instead of what would normally be created.
* LAYERS_NONE means "no hint".
*/
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager,
virtual LayerManager* GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr) = 0;

2
widget/windows/nsWindow.cpp
View File

@ -3210,7 +3210,7 @@ nsWindow::ShouldUseOffMainThreadCompositing()
}
LayerManager*
nsWindow::GetLayerManager(PLayerTransactionChild* aShadowManager,
nsWindow::GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence,
bool* aAllowRetaining)

2
widget/windows/nsWindow.h
View File

@ -136,7 +136,7 @@ public:
bool aDoCapture);
NS_IMETHOD GetAttention(int32_t aCycleCount);
virtual bool HasPendingInputEvent();
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
virtual LayerManager* GetLayerManager(PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);

2
widget/windows/winrt/MetroWidget.cpp
View File

@ -793,7 +793,7 @@ MetroWidget::ShouldUseBasicManager()
}
LayerManager*
MetroWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
MetroWidget::GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence,
bool* aAllowRetaining)

2
widget/windows/winrt/MetroWidget.h
View File

@ -119,7 +119,7 @@ public:
virtual bool ShouldUseOffMainThreadCompositing();
bool ShouldUseMainThreadD3D10Manager();
bool ShouldUseBasicManager();
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
virtual LayerManager* GetLayerManager(PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);

4
widget/xpwidgets/PuppetWidget.cpp
View File

@ -15,7 +15,7 @@
#include "mozilla/dom/TabChild.h"
#include "mozilla/Hal.h"
#include "mozilla/layers/CompositorChild.h"
#include "mozilla/layers/PLayerTransactionChild.h"
#include "mozilla/layers/PLayersChild.h"
#include "PuppetWidget.h"
#include "nsIWidgetListener.h"
@ -304,7 +304,7 @@ PuppetWidget::DispatchEvent(nsGUIEvent* event, nsEventStatus& aStatus)
}
LayerManager*
PuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
PuppetWidget::GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence,
bool* aAllowRetaining)

2
widget/xpwidgets/PuppetWidget.h
View File

@ -143,7 +143,7 @@ public:
{ return eTransparencyTransparent; }
virtual LayerManager*
GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
GetLayerManager(PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);

6
widget/xpwidgets/nsBaseWidget.cpp
View File

@ -896,9 +896,9 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
mCompositorChild->Open(parentChannel, childMessageLoop, childSide);
TextureFactoryIdentifier textureFactoryIdentifier;
PLayerTransactionChild* shadowManager;
PLayersChild* shadowManager;
mozilla::layers::LayersBackend backendHint = mozilla::layers::LAYERS_OPENGL;
shadowManager = mCompositorChild->SendPLayerTransactionConstructor(
shadowManager = mCompositorChild->SendPLayersConstructor(
backendHint, 0, &textureFactoryIdentifier);
if (shadowManager) {
@ -927,7 +927,7 @@ bool nsBaseWidget::ShouldUseOffMainThreadCompositing()
return CompositorParent::CompositorLoop() && !isSmallPopup;
}
LayerManager* nsBaseWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
LayerManager* nsBaseWidget::GetLayerManager(PLayersChild* aShadowManager,
LayersBackend aBackendHint,
LayerManagerPersistence aPersistence,
bool* aAllowRetaining)

2
widget/xpwidgets/nsBaseWidget.h
View File

@ -105,7 +105,7 @@ public:
NS_IMETHOD HideWindowChrome(bool aShouldHide);
NS_IMETHOD MakeFullScreen(bool aFullScreen);
virtual nsDeviceContext* GetDeviceContext();
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
virtual LayerManager* GetLayerManager(PLayersChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);