Bug 1213429 - GCC compilation fixup.
authorJacek Caban <jacek@codeweavers.com>
Sun, 07 Feb 2016 13:15:21 +0100
changeset 283399 d6ff849aa65c4f89effa07e26933b29b1cf4ff00
parent 283398 258389005e0ce17f81d80e733d78f99bf273ec3c
child 283400 1d13b1102685e955931f51253a65f9d7d81f1526
push id29980
push userphilringnalda@gmail.com
push dateSun, 07 Feb 2016 23:30:48 +0000
treeherdermozilla-central@1cfe34ea394c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1213429
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1213429 - GCC compilation fixup.
gfx/layers/d3d9/TextureD3D9.cpp
--- a/gfx/layers/d3d9/TextureD3D9.cpp
+++ b/gfx/layers/d3d9/TextureD3D9.cpp
@@ -429,17 +429,17 @@ DataTextureSourceD3D9::Update(gfx::DataS
 
     RefPtr<IDirect3DSurface9> destSurface;
     mTexture->GetSurfaceLevel(0, getter_AddRefs(destSurface));
 
     D3DLOCKED_RECT rect;
     HRESULT hr = srcSurface->LockRect(&rect, nullptr, 0);
     if (FAILED(hr) || !rect.pBits) {
       gfxCriticalError() << "Failed to lock rect initialize texture in D3D9 " << hexa(hr);
-      return nullptr;
+      return false;
     }
 
     for (auto iter = regionToUpdate.RectIter(); !iter.Done(); iter.Next()) {
       const nsIntRect& iterRect = iter.Get();
       uint8_t* src = map.mData + map.mStride * iterRect.y + BytesPerPixel(aSurface->GetFormat()) * iterRect.x;
       uint8_t* dest = reinterpret_cast<uint8_t*>(rect.pBits) + rect.Pitch * iterRect.y + BytesPerPixel(aSurface->GetFormat()) * iterRect.x;
 
       for (int y = 0; y < iterRect.height; y++) {