From b61b54f6427070ebb70d82c6b37cb5bdf726e546 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 3 Jun 2016 18:31:05 -0400 Subject: [PATCH] Bug 1277647 - return the correct type from ANativeWindow_setBuffersGeometry; r=snorp This function returns a boolean, so let's return that, rather than relying on pointer-to-boolean coercion. --- gfx/gl/AndroidNativeWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/gl/AndroidNativeWindow.cpp b/gfx/gl/AndroidNativeWindow.cpp index 967377a0ca3d..219dbb9c765a 100644 --- a/gfx/gl/AndroidNativeWindow.cpp +++ b/gfx/gl/AndroidNativeWindow.cpp @@ -62,7 +62,7 @@ public: bool ANativeWindow_setBuffersGeometry(void* aWindow, int32_t aWidth, int32_t aHeight, int32_t aFormat) { ALOG("%s: window=%p, width=%d, height=%d, format=%d\n", __PRETTY_FUNCTION__, aWindow, aWidth, aHeight, aFormat); if (!Initialized()) { - return nullptr; + return false; } return fANativeWindow_setBuffersGeometry(aWindow, aWidth, aHeight, (int32_t)aFormat) == 0; @@ -278,4 +278,4 @@ AndroidNativeWindow::UnlockAndPost() } -#endif // MOZ_WIDGET_ANDROID \ No newline at end of file +#endif // MOZ_WIDGET_ANDROID