Commit d25d1359 authored by Marian-Vasile Laza's avatar Marian-Vasile Laza
Browse files

Backed out 7 changesets (bug 1728050, bug 1728251, bug 1728232, bug 1542929,... 

Backed out 7 changesets (bug 1728050, bug 1728251, bug 1728232, bug 1542929, bug 1714138, bug 1728258) for causing reftest failures. CLOSED TREE

Backed out changeset 41e053201cd3 (bug 1714138)
Backed out changeset 16ae9f5b4aa0 (bug 1728258)
Backed out changeset 414aa7ff05fe (bug 1542929)
Backed out changeset 7217ecf149c4 (bug 1728251)
Backed out changeset 405ff2ed2110 (bug 1728251)
Backed out changeset 3eec9e6c7218 (bug 1728232)
Backed out changeset 66038c15fe54 (bug 1728050)
parent 2e2a57ae

gfx/layers/wr/ClipManager.cpp

+2 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ Maybe<wr::WrSpatialId> ClipManager::DefineScrollLayers( 


  Maybe<ScrollMetadata> metadata =

      aASR->mScrollableFrame->ComputeScrollMetadata(

          mManager, aItem->Frame(), aItem->ToReferenceFrame(), nullptr);

          mManager, aItem->ReferenceFrame(), nullptr);

  if (!metadata) {

    MOZ_ASSERT_UNREACHABLE("Expected scroll metadata to be available!");

    return ancestorSpace;
@@ -289,8 +289,7 @@ Maybe<wr::WrSpatialId> ClipManager::DefineScrollLayers( 


  nsIScrollableFrame* scrollableFrame = aASR->mScrollableFrame;

  nsIFrame* scrollFrame = do_QueryFrame(scrollableFrame);

  nsPoint offset = scrollFrame->GetOffsetToCrossDoc(aItem->Frame()) +

                   aItem->ToReferenceFrame();

  nsPoint offset = scrollFrame->GetOffsetToCrossDoc(aItem->ReferenceFrame());

  float auPerDevPixel = aItem->Frame()->PresContext()->AppUnitsPerDevPixel();

  nsRect scrollPort = scrollableFrame->GetScrollPortRect() + offset;

  LayoutDeviceRect clipBounds =

gfx/layers/wr/DisplayItemCache.cpp

+0 −6
Original line number Diff line number Diff line
@@ -180,12 +180,6 @@ Maybe<uint16_t> DisplayItemCache::CanReuseItem( 
    return Nothing();

  }



  if (mSuppressed) {

    slot.mOccupied = false;

    slotIndex = Nothing();

    return Nothing();

  }



  if (!(aSpaceAndClip == slot.mSpaceAndClip)) {

    // Spatial id and clip id can change between display lists, if items that

    // generate them change their order.

gfx/layers/wr/DisplayItemCache.h

+3 −3
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ class DisplayItemCache final { 
  /**

   * Suppress display item caching. This doesn't clear any existing cached

   * items or change the underlying capacity, it just makes IsEnabled() return

   * false.

   * It will also make CanReuseItem return false for the duration of the

   * suppression.

   * false. It is not meant to be flipped in the middle of a display list build,

   * but rather set before the display list build starts to suppress use of the

   * cache for that display list build.

   */

  bool SetSuppressed(bool aSuppressed) {

    if (aSuppressed == mSuppressed) {

gfx/layers/wr/WebRenderCommandBuilder.cpp

+4 −6
Original line number Diff line number Diff line
@@ -2484,8 +2484,6 @@ Maybe<wr::ImageMask> WebRenderCommandBuilder::BuildWrMaskImage( 


  nsPoint maskOffset = aMaskItem->ToReferenceFrame() - bounds.TopLeft();



  bool shouldHandleOpacity = aBuilder.GetInheritedOpacity() != 1.0f;



  nsRect dirtyRect;

  // If this mask item is being painted for the first time, some members of

  // WebRenderMaskData are still default initialized. This is intentional.
@@ -2493,7 +2491,7 @@ Maybe<wr::ImageMask> WebRenderCommandBuilder::BuildWrMaskImage( 
      !itemRect.IsEqualInterior(maskData->mItemRect) ||

      !(aMaskItem->Frame()->StyleSVGReset()->mMask == maskData->mMaskStyle) ||

      maskOffset != maskData->mMaskOffset || !sameScale ||

      shouldHandleOpacity != maskData->mShouldHandleOpacity) {

      aMaskItem->ShouldHandleOpacity() != maskData->mShouldHandleOpacity) {

    IntSize size = itemRect.Size().ToUnknownSize();



    if (!Factory::AllowedSurfaceSize(size)) {
@@ -2537,8 +2535,8 @@ Maybe<wr::ImageMask> WebRenderCommandBuilder::BuildWrMaskImage( 
                           .PreScale(scale.width, scale.height));



    bool maskPainted = false;

    bool maskIsComplete = aMaskItem->PaintMask(

        aDisplayListBuilder, context, shouldHandleOpacity, &maskPainted);

    bool maskIsComplete =

        aMaskItem->PaintMask(aDisplayListBuilder, context, &maskPainted);

    if (!maskPainted) {

      return Nothing();

    }
@@ -2589,7 +2587,7 @@ Maybe<wr::ImageMask> WebRenderCommandBuilder::BuildWrMaskImage( 
      maskData->mMaskOffset = maskOffset;

      maskData->mScale = scale;

      maskData->mMaskStyle = aMaskItem->Frame()->StyleSVGReset()->mMask;

      maskData->mShouldHandleOpacity = shouldHandleOpacity;

      maskData->mShouldHandleOpacity = aMaskItem->ShouldHandleOpacity();

    }

  }

gfx/layers/wr/WebRenderScrollData.cpp

+1 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ void WebRenderLayerScrollData::Initialize( 
    } else {

      Maybe<ScrollMetadata> metadata =

          asr->mScrollableFrame->ComputeScrollMetadata(

              aOwner.GetManager(), aItem->Frame(), aItem->ToReferenceFrame(),

              nullptr);

              aOwner.GetManager(), aItem->ReferenceFrame(), nullptr);

      aOwner.GetBuilder()->AddScrollFrameToNotify(asr->mScrollableFrame);

      if (metadata) {

        MOZ_ASSERT(metadata->GetMetrics().GetScrollId() == scrollId);