Commit 642579b6 authored by Matt Woodrow's avatar Matt Woodrow
Browse files

Bug 1728232 - Remove RestoreState. r=miko 

Differential Revision: https://phabricator.services.mozilla.com/D124006
parent fcd01e0c

layout/generic/TextDrawTarget.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class TextDrawTarget : public DrawTarget { 
    mHasUnsupportedFeatures = false;

    mHasShadows = false;



    SetPermitSubpixelAA(!aItem->IsSubpixelAADisabled());

    SetPermitSubpixelAA(true);



    // Compute clip/bounds

    auto appUnitsPerDevPixel =

layout/generic/TextOverflow.cpp

+0 −3
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ static void PaintTextShadowCallback(gfxContext* aCtx, nsPoint aShadowOffset, 


void nsDisplayTextOverflowMarker::Paint(nsDisplayListBuilder* aBuilder,

                                        gfxContext* aCtx) {

  DrawTargetAutoDisableSubpixelAntialiasing disable(aCtx->GetDrawTarget(),

                                                    IsSubpixelAADisabled());



  nscolor foregroundColor =

      nsLayoutUtils::GetColor(mFrame, &nsStyleText::mWebkitTextFillColor);

layout/generic/nsPageFrame.cpp

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ class nsDisplayHeaderFooter final : public nsPaintedDisplayItem { 
    MOZ_ASSERT(pageFrame, "We should have an nsPageFrame");

#endif

    static_cast<nsPageFrame*>(mFrame)->PaintHeaderFooter(

        *aCtx, ToReferenceFrame(), IsSubpixelAADisabled());

        *aCtx, ToReferenceFrame(), false);

  }

  NS_DISPLAY_DECL_NAME("HeaderFooter", TYPE_HEADER_FOOTER)

layout/painting/RetainedDisplayListBuilder.cpp

+0 −7
Original line number Diff line number Diff line
@@ -280,13 +280,6 @@ bool RetainedDisplayListBuilder::PreProcessDisplayList( 
      mBuilder.MarkFrameForDisplayIfVisible(f, mBuilder.RootReferenceFrame());

    }



    // TODO: This is here because we sometimes reuse the previous display list

    // completely. For optimization, we could only restore the state for reused

    // display items.

    if (item->RestoreState()) {

      item->InvalidateItemCacheEntry();

    }



    // If we're going to keep this linked list and not merge it, then mark the

    // item as used and put it back into the list.

    if (aKeepLinked) {

layout/painting/nsDisplayList.cpp

+3 −11
Original line number Diff line number Diff line
@@ -2815,11 +2815,6 @@ void nsDisplayItem::SetClipChain(const DisplayItemClipChain* aClipChain, 
                                 bool aStore) {

  mClipChain = aClipChain;

  mClip = DisplayItemClipChain::ClipForASR(aClipChain, mActiveScrolledRoot);



  if (aStore) {

    mState.mClipChain = mClipChain;

    mState.mClip = mClip;

  }

}



Maybe<nsRect> nsDisplayItem::GetClipWithRespectToASR(
@@ -4767,6 +4762,7 @@ nsDisplayWrapList::nsDisplayWrapList( 


  mListPtr = &mList;

  mListPtr->AppendToTop(aList);

  mOriginalClipChain = mClipChain;

  nsDisplayWrapList::UpdateBounds(aBuilder);



#ifdef DEBUG
@@ -4795,6 +4791,7 @@ nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder, 


  mListPtr = &mList;

  mListPtr->AppendToTop(aItem);

  mOriginalClipChain = mClipChain;

  nsDisplayWrapList::UpdateBounds(aBuilder);



  if (!aFrame || !aFrame->IsTransformed()) {
@@ -5848,8 +5845,7 @@ void nsDisplayStickyPosition::SetClipChain( 
             "with it.");



  if (aStore) {

    mState.mClipChain = aClipChain;

    mState.mClip = mClip;

    mOriginalClipChain = aClipChain;

  }

}
@@ -6389,7 +6385,6 @@ void nsDisplayTransform::SetReferenceFrameToAncestor( 


void nsDisplayTransform::Init(nsDisplayListBuilder* aBuilder,

                              nsDisplayList* aChildren) {

  mShouldFlatten = false;

  mChildren.AppendToTop(aChildren);

  UpdateBounds(aBuilder);

}
@@ -7803,9 +7798,6 @@ bool nsDisplayText::CanApplyOpacity(WebRenderLayerManager* aManager, 


void nsDisplayText::Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) {

  AUTO_PROFILER_LABEL("nsDisplayText::Paint", GRAPHICS);



  DrawTargetAutoDisableSubpixelAntialiasing disable(aCtx->GetDrawTarget(),

                                                    IsSubpixelAADisabled());

  RenderToContext(aCtx, aBuilder);

}