Bug 903112 - Replace this with MOZ_THIS_IN_INITIALIZER_LIST() in gfx/. r=jfkthame
--- a/gfx/layers/basic/BasicCanvasLayer.h
+++ b/gfx/layers/basic/BasicCanvasLayer.h
@@ -24,17 +24,18 @@ namespace layers {
class CanvasClient2D;
class CanvasClientWebGL;
class BasicCanvasLayer : public CopyableCanvasLayer,
public BasicImplData
{
public:
BasicCanvasLayer(BasicLayerManager* aLayerManager) :
- CopyableCanvasLayer(aLayerManager, static_cast<BasicImplData*>(this))
+ CopyableCanvasLayer(aLayerManager,
+ static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{ }
virtual void SetVisibleRegion(const nsIntRegion& aRegion)
{
NS_ASSERTION(BasicManager()->InConstruction(),
"Can only set properties in construction phase");
CanvasLayer::SetVisibleRegion(aRegion);
}
--- a/gfx/layers/basic/BasicColorLayer.cpp
+++ b/gfx/layers/basic/BasicColorLayer.cpp
@@ -9,17 +9,18 @@
using namespace mozilla::gfx;
namespace mozilla {
namespace layers {
class BasicColorLayer : public ColorLayer, public BasicImplData {
public:
BasicColorLayer(BasicLayerManager* aLayerManager) :
- ColorLayer(aLayerManager, static_cast<BasicImplData*>(this))
+ ColorLayer(aLayerManager,
+ static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{
MOZ_COUNT_CTOR(BasicColorLayer);
}
virtual ~BasicColorLayer()
{
MOZ_COUNT_DTOR(BasicColorLayer);
}
--- a/gfx/layers/basic/BasicContainerLayer.h
+++ b/gfx/layers/basic/BasicContainerLayer.h
@@ -173,17 +173,18 @@ class BasicContainerLayer : public Conta
template<class Container>
friend void ContainerRepositionChild(Layer* aChild, Layer* aAfter, Container* aContainer);
template<class Container>
friend void ContainerComputeEffectiveTransforms(const gfx3DMatrix& aTransformToSurface,
Container* aContainer);
public:
BasicContainerLayer(BasicLayerManager* aManager) :
- ContainerLayer(aManager, static_cast<BasicImplData*>(this))
+ ContainerLayer(aManager,
+ static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{
MOZ_COUNT_CTOR(BasicContainerLayer);
mSupportsComponentAlphaChildren = true;
}
virtual ~BasicContainerLayer();
virtual void SetVisibleRegion(const nsIntRegion& aRegion)
{
--- a/gfx/layers/basic/BasicImageLayer.cpp
+++ b/gfx/layers/basic/BasicImageLayer.cpp
@@ -17,17 +17,18 @@
using namespace mozilla::gfx;
namespace mozilla {
namespace layers {
class BasicImageLayer : public ImageLayer, public BasicImplData {
public:
BasicImageLayer(BasicLayerManager* aLayerManager) :
- ImageLayer(aLayerManager, static_cast<BasicImplData*>(this)),
+ ImageLayer(aLayerManager,
+ static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())),
mSize(-1, -1)
{
MOZ_COUNT_CTOR(BasicImageLayer);
}
virtual ~BasicImageLayer()
{
MOZ_COUNT_DTOR(BasicImageLayer);
}
--- a/gfx/layers/basic/BasicLayersImpl.h
+++ b/gfx/layers/basic/BasicLayersImpl.h
@@ -36,17 +36,18 @@ private:
nsRefPtr<gfxContext> mContext;
};
class BasicReadbackLayer : public ReadbackLayer,
public BasicImplData
{
public:
BasicReadbackLayer(BasicLayerManager* aLayerManager) :
- ReadbackLayer(aLayerManager, static_cast<BasicImplData*>(this))
+ ReadbackLayer(aLayerManager,
+ static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{
MOZ_COUNT_CTOR(BasicReadbackLayer);
}
virtual ~BasicReadbackLayer()
{
MOZ_COUNT_DTOR(BasicReadbackLayer);
}
--- a/gfx/layers/basic/BasicThebesLayer.h
+++ b/gfx/layers/basic/BasicThebesLayer.h
@@ -14,17 +14,18 @@ namespace mozilla {
namespace layers {
class BasicThebesLayer : public ThebesLayer, public BasicImplData {
public:
typedef ThebesLayerBuffer::PaintState PaintState;
typedef ThebesLayerBuffer::ContentType ContentType;
BasicThebesLayer(BasicLayerManager* aLayerManager) :
- ThebesLayer(aLayerManager, static_cast<BasicImplData*>(this)),
+ ThebesLayer(aLayerManager,
+ static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())),
mContentClient(nullptr)
{
MOZ_COUNT_CTOR(BasicThebesLayer);
}
virtual ~BasicThebesLayer()
{
MOZ_COUNT_DTOR(BasicThebesLayer);
}
--- a/gfx/layers/client/ClientCanvasLayer.h
+++ b/gfx/layers/client/ClientCanvasLayer.h
@@ -23,17 +23,18 @@ class CanvasClient2D;
class CanvasClientWebGL;
class ClientCanvasLayer : public CopyableCanvasLayer,
public ClientLayer
{
typedef CanvasClient::CanvasClientType CanvasClientType;
public:
ClientCanvasLayer(ClientLayerManager* aLayerManager) :
- CopyableCanvasLayer(aLayerManager, static_cast<ClientLayer*>(this))
+ CopyableCanvasLayer(aLayerManager,
+ static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{
MOZ_COUNT_CTOR(ClientCanvasLayer);
}
virtual ~ClientCanvasLayer()
{
MOZ_COUNT_DTOR(ClientCanvasLayer);
if (mCanvasClient) {
mCanvasClient->OnDetach();
--- a/gfx/layers/client/ClientColorLayer.cpp
+++ b/gfx/layers/client/ClientColorLayer.cpp
@@ -10,17 +10,18 @@ using namespace mozilla::gfx;
namespace mozilla {
namespace layers {
class ClientColorLayer : public ColorLayer,
public ClientLayer {
public:
ClientColorLayer(ClientLayerManager* aLayerManager) :
- ColorLayer(aLayerManager, static_cast<ClientLayer*>(this))
+ ColorLayer(aLayerManager,
+ static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{
MOZ_COUNT_CTOR(ClientColorLayer);
}
virtual ~ClientColorLayer()
{
MOZ_COUNT_DTOR(ClientColorLayer);
}
--- a/gfx/layers/client/ClientContainerLayer.h
+++ b/gfx/layers/client/ClientContainerLayer.h
@@ -134,17 +134,18 @@ class ClientContainerLayer : public Cont
friend void ContainerInsertAfter(Layer* aChild, Layer* aAfter, Container* aContainer);
template<class Container>
friend void ContainerRemoveChild(Layer* aChild, Container* aContainer);
template<class Container>
friend void ContainerRepositionChild(Layer* aChild, Layer* aAfter, Container* aContainer);
public:
ClientContainerLayer(ClientLayerManager* aManager) :
- ContainerLayer(aManager, static_cast<ClientLayer*>(this))
+ ContainerLayer(aManager,
+ static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{
MOZ_COUNT_CTOR(ClientContainerLayer);
mSupportsComponentAlphaChildren = true;
}
virtual ~ClientContainerLayer()
{
while (mFirstChild) {
ContainerRemoveChild(mFirstChild, this);
@@ -245,17 +246,18 @@ protected:
return static_cast<ClientLayerManager*>(mManager);
}
};
class ClientRefLayer : public RefLayer,
public ClientLayer {
public:
ClientRefLayer(ClientLayerManager* aManager) :
- RefLayer(aManager, static_cast<ClientLayer*>(this))
+ RefLayer(aManager,
+ static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
{
MOZ_COUNT_CTOR(ClientRefLayer);
}
virtual ~ClientRefLayer()
{
MOZ_COUNT_DTOR(ClientRefLayer);
}
--- a/gfx/layers/client/ClientImageLayer.cpp
+++ b/gfx/layers/client/ClientImageLayer.cpp
@@ -12,17 +12,18 @@ using namespace mozilla::gfx;
namespace mozilla {
namespace layers {
class ClientImageLayer : public ImageLayer,
public ClientLayer {
public:
ClientImageLayer(ClientLayerManager* aLayerManager)
- : ImageLayer(aLayerManager, static_cast<ClientLayer*>(this))
+ : ImageLayer(aLayerManager,
+ static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
, mImageClientTypeContainer(BUFFER_UNKNOWN)
{
MOZ_COUNT_CTOR(ClientImageLayer);
}
virtual ~ClientImageLayer()
{
DestroyBackBuffer();
MOZ_COUNT_DTOR(ClientImageLayer);
--- a/gfx/layers/client/ClientThebesLayer.h
+++ b/gfx/layers/client/ClientThebesLayer.h
@@ -15,17 +15,18 @@ namespace layers {
class ClientThebesLayer : public ThebesLayer,
public ClientLayer {
public:
typedef ThebesLayerBuffer::PaintState PaintState;
typedef ThebesLayerBuffer::ContentType ContentType;
ClientThebesLayer(ClientLayerManager* aLayerManager) :
- ThebesLayer(aLayerManager, static_cast<ClientLayer*>(this)),
+ ThebesLayer(aLayerManager,
+ static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST())),
mContentClient(nullptr)
{
MOZ_COUNT_CTOR(ClientThebesLayer);
}
virtual ~ClientThebesLayer()
{
if (mContentClient) {
mContentClient->OnDetach();
--- a/gfx/layers/client/ClientTiledThebesLayer.cpp
+++ b/gfx/layers/client/ClientTiledThebesLayer.cpp
@@ -9,17 +9,18 @@
#include "gfxPlatform.h"
namespace mozilla {
namespace layers {
ClientTiledThebesLayer::ClientTiledThebesLayer(ClientLayerManager* const aManager)
- : ThebesLayer(aManager, static_cast<ClientLayer*>(this))
+ : ThebesLayer(aManager,
+ static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
, mContentClient()
{
MOZ_COUNT_CTOR(ClientTiledThebesLayer);
mPaintData.mLastScrollOffset = CSSPoint(0, 0);
mPaintData.mFirstPaint = true;
}
ClientTiledThebesLayer::~ClientTiledThebesLayer()
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -166,18 +166,18 @@ AsyncPanZoomController::AsyncPanZoomCont
GeckoContentController* aGeckoContentController,
GestureBehavior aGestures)
: mLayersId(aLayersId),
mPaintThrottler(GetFrameTime()),
mGeckoContentController(aGeckoContentController),
mRefPtrMonitor("RefPtrMonitor"),
mMonitor("AsyncPanZoomController"),
mTouchListenerTimeoutTask(nullptr),
- mX(this),
- mY(this),
+ mX(MOZ_THIS_IN_INITIALIZER_LIST()),
+ mY(MOZ_THIS_IN_INITIALIZER_LIST()),
mAllowZoom(true),
mMinZoom(MIN_ZOOM),
mMaxZoom(MAX_ZOOM),
mLastSampleTime(GetFrameTime()),
mState(NOTHING),
mLastAsyncScrollTime(GetFrameTime()),
mLastAsyncScrollOffset(0, 0),
mCurrentAsyncScrollOffset(0, 0),
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -242,17 +242,18 @@ static const char *gPrefLangNames[] = {
"x-knda",
"x-sinh",
"x-tibt",
"x-unicode",
"x-user-def"
};
gfxPlatform::gfxPlatform()
- : mAzureCanvasBackendCollector(this, &gfxPlatform::GetAzureBackendInfo)
+ : mAzureCanvasBackendCollector(MOZ_THIS_IN_INITIALIZER_LIST(),
+ &gfxPlatform::GetAzureBackendInfo)
, mDrawLayerBorders(false)
, mDrawTileBorders(false)
, mDrawBigImageBorders(false)
{
mUseHarfBuzzScripts = UNINITIALIZED_VALUE;
mAllowDownloadableFonts = UNINITIALIZED_VALUE;
mFallbackUsesCmaps = UNINITIALIZED_VALUE;
@@ -1999,9 +2000,9 @@ bool
gfxPlatform::ComponentAlphaEnabled()
{
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
return false;
#endif
InitLayersAccelerationPrefs();
return sComponentAlphaEnabled;
-}
\ No newline at end of file
+}