Bug 1293596 (part 7) - Make nsIWidget::Destroy infallible. r=karlt.

2016-08-10 10:04:11 +10:00
parent 628ec722f3
commit ab7ae3b80d
22 changed files with 35 additions and 50 deletions
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@@ -170,11 +170,11 @@ PuppetWidget::CreateChild(const LayoutDeviceIntRect& aRect,
          widget.forget() : nullptr);
 }

-NS_IMETHODIMP
+void
 PuppetWidget::Destroy()
 {
  if (mOnDestroyCalled) {
-    return NS_OK;
+    return;
  }
  mOnDestroyCalled = true;

@@ -191,7 +191,6 @@ PuppetWidget::Destroy()
  }
  mLayerManager = nullptr;
  mTabChild = nullptr;
-  return NS_OK;
 }

 NS_IMETHODIMP