Bug 1402370 nullptr cannot be cast to bool, so return false instead of nullptr in GLBlitHelperD3D.cpp r=jrmuizel
authorTom Ritter <tom@mozilla.com>
Fri, 22 Sep 2017 11:10:04 -0500
changeset 383079 abdad1de090e92786a38c4df3ec9d9838c5c78cf
parent 383078 3dd3689dbb207a82348b2e82394f4f44f0396fe1
child 383080 17a1159f7f4d38777269f00b595096dce6f63d26
push id32582
push userkwierso@gmail.com
push dateWed, 27 Sep 2017 00:11:27 +0000
treeherdermozilla-central@70158e4e215d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1402370
milestone58.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 1402370 nullptr cannot be cast to bool, so return false instead of nullptr in GLBlitHelperD3D.cpp r=jrmuizel MozReview-Commit-ID: EeboZBGD0Es
gfx/gl/GLBlitHelperD3D.cpp
old mode 100644
new mode 100755
--- a/gfx/gl/GLBlitHelperD3D.cpp
+++ b/gfx/gl/GLBlitHelperD3D.cpp
@@ -256,17 +256,17 @@ GLBlitHelper::BlitDescriptor(const layer
 
     const auto srcOrigin = OriginPos::BottomLeft;
     const gfx::IntRect clipRect(0, 0, clipSize.width, clipSize.height);
     const auto colorSpace = YUVColorSpace::BT601;
 
     if (format != gfx::SurfaceFormat::NV12) {
         gfxCriticalError() << "Non-NV12 format for SurfaceDescriptorD3D10: "
                            << uint32_t(format);
-        return nullptr;
+        return false;
     }
 
     const auto tex = OpenSharedTexture(d3d, handle);
     const RefPtr<ID3D11Texture2D> texList[2] = { tex, tex };
     const EGLAttrib postAttribs0[] = {
         LOCAL_EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG, 0,
         LOCAL_EGL_NONE
     };