--- a/widget/CompositorWidgetProxy.cpp
+++ b/widget/CompositorWidgetProxy.cpp
@@ -65,153 +65,108 @@ CompositorWidgetProxy::GetGLFrameBufferF
 CompositorWidgetProxyWrapper::CompositorWidgetProxyWrapper(nsBaseWidget* aWidget)
  : mWidget(aWidget)
 {
 }
 
 bool
 CompositorWidgetProxyWrapper::PreRender(layers::LayerManagerComposite* aManager)
 {
-  if (!mWidget) {
-    return false;
-  }
   return mWidget->PreRender(aManager);
 }
 
 void
 CompositorWidgetProxyWrapper::PostRender(layers::LayerManagerComposite* aManager)
 {
-  if (!mWidget) {
-    return;
-  }
   mWidget->PostRender(aManager);
 }
 
 void
 CompositorWidgetProxyWrapper::DrawWindowUnderlay(layers::LayerManagerComposite* aManager,
                                                  LayoutDeviceIntRect aRect)
 {
-  if (!mWidget) {
-    return;
-  }
   mWidget->DrawWindowUnderlay(aManager, aRect);
 }
 
 void
 CompositorWidgetProxyWrapper::DrawWindowOverlay(layers::LayerManagerComposite* aManager,
                                                 LayoutDeviceIntRect aRect)
 {
-  if (!mWidget) {
-    return;
-  }
   mWidget->DrawWindowOverlay(aManager, aRect);
 }
 
 already_AddRefed<gfx::DrawTarget>
 CompositorWidgetProxyWrapper::StartRemoteDrawing()
 {
-  if (!mWidget) {
-    return nullptr;
-  }
   return mWidget->StartRemoteDrawing();
 }
 
 already_AddRefed<gfx::DrawTarget>
 CompositorWidgetProxyWrapper::StartRemoteDrawingInRegion(LayoutDeviceIntRegion& aInvalidRegion,
                                                          layers::BufferMode* aBufferMode)
 {
-  if (!mWidget) {
-    return nullptr;
-  }
   return mWidget->StartRemoteDrawingInRegion(aInvalidRegion, aBufferMode);
 }
 
 void
 CompositorWidgetProxyWrapper::EndRemoteDrawing()
 {
-  if (!mWidget) {
-    return;
-  }
   mWidget->EndRemoteDrawing();
 }
 
 void
 CompositorWidgetProxyWrapper::EndRemoteDrawingInRegion(gfx::DrawTarget* aDrawTarget,
                                                        LayoutDeviceIntRegion& aInvalidRegion)
 {
-  if (!mWidget) {
-    return;
-  }
   mWidget->EndRemoteDrawingInRegion(aDrawTarget, aInvalidRegion);
 }
 
 void
 CompositorWidgetProxyWrapper::CleanupRemoteDrawing()
 {
-  if (mWidget) {
-    mWidget->CleanupRemoteDrawing();
-  }
-  CompositorWidgetProxy::CleanupRemoteDrawing();
+  mWidget->CleanupRemoteDrawing();
 }
 
 void
 CompositorWidgetProxyWrapper::CleanupWindowEffects()
 {
-  if (!mWidget) {
-    return;
-  }
   mWidget->CleanupWindowEffects();
 }
 
 bool
 CompositorWidgetProxyWrapper::InitCompositor(layers::Compositor* aCompositor)
 {
-  if (!mWidget) {
-    return false;
-  }
   return mWidget->InitCompositor(aCompositor);
 }
 
 LayoutDeviceIntSize
 CompositorWidgetProxyWrapper::GetClientSize()
 {
-  if (!mWidget) {
-    return LayoutDeviceIntSize();
-  }
   return mWidget->GetClientSize();
 }
 
 uint32_t
 CompositorWidgetProxyWrapper::GetGLFrameBufferFormat()
 {
-  if (!mWidget) {
-    return CompositorWidgetProxy::GetGLFrameBufferFormat();
-  }
   return mWidget->GetGLFrameBufferFormat();
 }
 
 layers::Composer2D*
 CompositorWidgetProxyWrapper::GetComposer2D()
 {
-  if (!mWidget) {
-    return nullptr;
-  }
   return mWidget->GetComposer2D();
 }
 
 nsIWidget*
 CompositorWidgetProxyWrapper::RealWidget()
 {
   return mWidget;
 }
 
 already_AddRefed<CompositorVsyncDispatcher>
 CompositorWidgetProxyWrapper::GetCompositorVsyncDispatcher()
 {
-  if (!mWidget) {
-    return nullptr;
-  }
   RefPtr<CompositorVsyncDispatcher> cvd = mWidget->GetCompositorVsyncDispatcher();
   return cvd.forget();
 }
 
 } // namespace widget
 } // namespace mozilla