From 383397bc5b823d732194cdf0c5dc7e6992ffb970 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 5 Nov 2015 14:34:14 -0500 Subject: [PATCH] Bug 1222569 - fix initialization order in DataTextureSourceD3D9; r=Bas Member fields are supposed to be initialized in the order they are declared, but the constructors of DataTextureSourceD3D9 initialized mFormat prior to mCompositor. This is probably harmless, but it does cause a warning on clang-cl, so let's fix it. --- gfx/layers/d3d9/TextureD3D9.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gfx/layers/d3d9/TextureD3D9.cpp b/gfx/layers/d3d9/TextureD3D9.cpp index e2c865e1760f..637de1f651b0 100644 --- a/gfx/layers/d3d9/TextureD3D9.cpp +++ b/gfx/layers/d3d9/TextureD3D9.cpp @@ -278,8 +278,8 @@ DataTextureSourceD3D9::DataTextureSourceD3D9(gfx::SurfaceFormat aFormat, CompositorD3D9* aCompositor, TextureFlags aFlags, StereoMode aStereoMode) - : mFormat(aFormat) - , mCompositor(aCompositor) + : mCompositor(aCompositor) + , mFormat(aFormat) , mCurrentTile(0) , mFlags(aFlags) , mIsTiled(false) @@ -294,8 +294,8 @@ DataTextureSourceD3D9::DataTextureSourceD3D9(gfx::SurfaceFormat aFormat, CompositorD3D9* aCompositor, IDirect3DTexture9* aTexture, TextureFlags aFlags) - : mFormat(aFormat) - , mCompositor(aCompositor) + : mCompositor(aCompositor) + , mFormat(aFormat) , mCurrentTile(0) , mFlags(aFlags) , mIsTiled(false)