Bug 1392705 - part 3: Ensure mWidget is valid in AndroidCompositorWidget r=jchen
MozReview-Commit-ID: FmkhC2jBleC
--- a/widget/android/AndroidCompositorWidget.cpp
+++ b/widget/android/AndroidCompositorWidget.cpp
@@ -8,31 +8,40 @@
#include "nsWindow.h"
namespace mozilla {
namespace widget {
EGLNativeWindowType
AndroidCompositorWidget::GetEGLNativeWindow()
{
+ if (!mWidget) {
+ return nullptr;
+ }
return (EGLNativeWindowType)mWidget->GetNativeData(NS_JAVA_SURFACE);
}
EGLNativeWindowType
AndroidCompositorWidget::GetPresentationEGLSurface()
{
+ if (!mWidget) {
+ return nullptr;
+ }
return (EGLNativeWindowType)mWidget->GetNativeData(NS_PRESENTATION_SURFACE);
}
void
AndroidCompositorWidget::SetPresentationEGLSurface(EGLSurface aVal)
{
mWidget->SetNativeData(NS_PRESENTATION_SURFACE, (uintptr_t)aVal);
}
ANativeWindow*
AndroidCompositorWidget::GetPresentationANativeWindow()
{
+ if (!mWidget) {
+ return nullptr;
+ }
return (ANativeWindow*)mWidget->GetNativeData(NS_PRESENTATION_WINDOW);
}
} // namespace widget
} // namespace mozilla