Bug 1392705 - part 2: Ensure LayerManagerComposite::RenderToPresentationSurface checks the compositor widget before using it r=kats draft
authorRandall Barker <rbarker@mozilla.com>
Fri, 01 Sep 2017 11:17:12 -0700
changeset 662528 9c747d9d93354a8841b1098f95cb1cec275f7963
parent 662527 b5f139e12e6e7bb7bc18f8ed702f981751c82156
child 662529 b313fa65eaac14ae04ea7291d74e75ed3ce3b185
push id79112
push userbmo:rbarker@mozilla.com
push dateMon, 11 Sep 2017 19:54:17 +0000
reviewerskats
bugs1392705
milestone57.0a1
Bug 1392705 - part 2: Ensure LayerManagerComposite::RenderToPresentationSurface checks the compositor widget before using it r=kats MozReview-Commit-ID: 6EP9Pp4h5cP
gfx/layers/composite/LayerManagerComposite.cpp
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -1054,17 +1054,26 @@ public:
   }
 private:
   GLContextEGL* const mContext;
 };
 
 void
 LayerManagerComposite::RenderToPresentationSurface()
 {
+  if (!mCompositor) {
+    return;
+  }
+
   widget::CompositorWidget* const widget = mCompositor->GetWidget();
+
+  if (!widget) {
+    return;
+  }
+
   ANativeWindow* window = widget->AsAndroid()->GetPresentationANativeWindow();
 
   if (!window) {
     return;
   }
 
   CompositorOGL* compositor = mCompositor->AsCompositorOGL();
   GLContext* gl = compositor->gl();