import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1107096 - Suppress improper drawing of zero-width invisible glyphs in canvas. r=roc (6f78376bc)
- Bug 1107096 - Reftest for zero-width invisible glyphs in canvas. (ded6cb516)
- Bug 1153958 - Make manifest processor e10s friendly. r=ehsan (ba5f6edf5)
- Bug 1162808 - Add splash_screens support to web manifest processor. r=ehsan (688bbe3d6)
- Bug 1164235 - Add theme_color support to web manifest processor. r=ehsan (0134f58fe)
- Bug 1143879 - Implement lang member of Web manifest. r=ehsan. (0b426965a)
- Bug 1166405 - Consolidate classes into a general web manifest module. r=ehsan. (98a6a4531)
- Bug 1162729 - CORS check is always performed when fetching a manifest. r=ehsan (aab278c12)
- Bug 1167335 - Make manifest obtainer use Task.jsm. r=oyiptong. (a4a48d767)
- Bug 1089255 - Implement and test manifest-src CSP directive. r=bholley, r=dveditz, r=ckerschb (63353eff3)
- Bug 968520 - Use move assignment instead of fallible copy assignment in nsCSPUtils.cpp. r=froydnj (fcaa9e865)
- Bug 968520 - Add mozilla::fallible to Fallible{Auto,}TArray::ReplaceElementsAt calls. r=froydnj (fb81d2305)
- Bug 968520 - Use FallibleTArray::Clear instead of SetLength(0). r=froydnj (3945e3e86)
- Bug 968520 - Add mozilla::fallible to FallibleTArray::InsertElementSorted calls. r=froydnj (dda295d5b)
- make some calls fallible - to get 968520 working (7722d850e)
- Bug 968520 - Always require fallible argument with FallibleTArray calls. r=froydnj (b9e630a76)
- Bug 968520 - Add mozilla::fallible to FallibleArray calls in tests. r=froydnj (53b58ac40)
- Bug 968520 - Explicitly use infallible allocator for ShiftData call in nsTArray::RemoveElementsAt. r=froydnj (9453996c3)
- Bug 1182808 - Part 1: Add and use fallible variant of AlignedTArray_Impl::SetLength. r=padenot (f6330791d)
- Bug 1143575. Replace ImageContainer Lock methods with simplified AutoLockImage. r=nical (c87ffec51)

gfx/layers/basic/BasicImageLayer.cpp

@@ -72,16 +72,19 @@ BasicImageLayer::Paint(DrawTarget* aDT,
   nsRefPtr<ImageFactory> originalIF = mContainer->GetImageFactory();
   mContainer->SetImageFactory(mManager->IsCompositingCheap() ? nullptr : BasicManager()->GetImageFactory());
 
-  RefPtr<gfx::SourceSurface> surface;
-  AutoLockImage autoLock(mContainer, &surface);
+  AutoLockImage autoLock(mContainer);
   Image *image = autoLock.GetImage();
-  gfx::IntSize size = mSize = autoLock.GetSize();
-
+  if (!image) {
+    mContainer->SetImageFactory(originalIF);
+    return;
+  }
+  RefPtr<gfx::SourceSurface> surface = image->GetAsSourceSurface();
   if (!surface || !surface->IsValid()) {
     mContainer->SetImageFactory(originalIF);
     return;
   }
 
+  gfx::IntSize size = mSize = surface->GetSize();
   FillRectWithMask(aDT, aDeviceOffset, Rect(0, 0, size.width, size.height), 
                    surface, ToFilter(mFilter),
                    DrawOptions(GetEffectiveOpacity(), GetEffectiveOperator(this)),
@@ -98,8 +101,12 @@ BasicImageLayer::GetAsSourceSurface()
     return nullptr;
   }
 
-  gfx::IntSize dontCare;
-  return mContainer->GetCurrentAsSourceSurface(&dontCare);
+  AutoLockImage lockImage(mContainer);
+  Image* image = lockImage.GetImage();
+  if (!image) {
+    return nullptr;
+  }
+  return image->GetAsSourceSurface();
 }
 
 already_AddRefed<ImageLayer>