Bug 1241764: Merge bug 1212323. r=me CLOSED TREE

This commit is contained in:
Kyle Huey 2016-01-30 09:33:24 -08:00
parent 94f653c385
commit 0fab08d885

View File

@ -2153,9 +2153,10 @@ nsDOMWindowUtils::GetLayerManagerRemote(bool* retval)
NS_IMETHODIMP
nsDOMWindowUtils::GetSupportsHardwareH264Decoding(JS::MutableHandle<JS::Value> aPromise)
{
nsCOMPtr<nsPIDOMWindow> window = do_QueryReferent(mWindow);
nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryReferent(mWindow);
NS_ENSURE_STATE(window);
nsCOMPtr<nsIGlobalObject> parentObject = do_QueryInterface(window);
nsCOMPtr<nsIGlobalObject> parentObject =
do_QueryInterface(window->GetCurrentInnerWindow());
NS_ENSURE_STATE(parentObject);
#ifdef MOZ_FMP4
nsCOMPtr<nsIWidget> widget = GetWidget();