Backed out changeset ea9e4099e608 (bug 1580922) at request from jrmuizel CLOSED TREE

gfx/layers/wr/WebRenderCommandBuilder.cpp

@@ -2183,10 +2183,6 @@ WebRenderCommandBuilder::GenerateFallbackData(
   // Display item bounds should be unscaled
   aImageRect = visibleRect / layerScale;
 
-  // visibleRect that we use inside the blob
-  // is relative to the blob origin so adjust for that
-  visibleRect -= dtRect.TopLeft();
-
   nsDisplayItemGeometry* geometry = fallbackData->mGeometry;
 
   bool needPaint = true;
@@ -2265,9 +2261,11 @@ WebRenderCommandBuilder::GenerateFallbackData(
         fallbackData->mBasicLayerManager =
             new BasicLayerManager(BasicLayerManager::BLM_INACTIVE);
       }
+      // aOffset is (0, 0) because blobs don't want to normalize their
+      // coordinates
       bool isInvalidated = PaintItemByDrawTarget(
-          aItem, dt, (dtRect/layerScale).TopLeft(),
-          /*aVisibleRect: */ dt->GetRect(), aDisplayListBuilder,
+          aItem, dt, LayoutDevicePoint(0, 0),
+          /*aVisibleRect: */ visibleRect.ToUnknownRect(), aDisplayListBuilder,
           fallbackData->mBasicLayerManager, scale, highlight);
       if (!isInvalidated) {
         if (!aItem->GetBuildingRect().IsEqualInterior(
@@ -2277,10 +2275,7 @@ WebRenderCommandBuilder::GenerateFallbackData(
           isInvalidated = true;
         }
       }
-
-      // the item bounds are relative to the blob origin which is
-      // dtRect.TopLeft()
-      recorder->FlushItem((dtRect - dtRect.TopLeft()).ToUnknownRect());
+      recorder->FlushItem(visibleRect.ToUnknownRect());
       recorder->Finish();
 
       if (!validFonts) {
@@ -2339,6 +2334,8 @@ WebRenderCommandBuilder::GenerateFallbackData(
             fallbackData->mBasicLayerManager =
                 new BasicLayerManager(mManager->GetWidget());
           }
+          // aOffset is applied because this case is a "real" image and not a
+          // blob
           isInvalidated = PaintItemByDrawTarget(
               aItem, dt,
               /*aOffset: */ aImageRect.TopLeft(),

testing/web-platform/meta/css/css-fill-stroke/paint-order-001.tentative.html.ini

@@ -3,3 +3,5 @@
     if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1520847
   expected:
     if (os == "win"): FAIL
+  fuzzy:
+    if webrender: maxDifference=64;totalPixels=0-46