Commit bd05e385 authored by Dorel Luca's avatar Dorel Luca
Browse files

Backed out 3 changesets (bug 1436904) for many crashes see bugs: 1440281,... 

Backed out 3 changesets (bug 1436904) for many crashes see bugs: 1440281, 1440302, 1440303, 1440313. a=backout

Backed out changeset 27f0762d4472 (bug 1436904)
Backed out changeset 27640f52e188 (bug 1436904)
Backed out changeset 2b4d117c27dc (bug 1436904)
parent 6ad641c5

layout/base/PresShell.cpp

+3 −3
Original line number Diff line number Diff line
@@ -5217,8 +5217,8 @@ PresShell::AddPrintPreviewBackgroundItem(nsDisplayListBuilder& aBuilder, 
                                         nsIFrame*             aFrame,

                                         const nsRect&         aBounds)

{

  aList.AppendToBottom(

    MakeDisplayItem<nsDisplaySolidColor>(&aBuilder, aFrame, aBounds, NS_RGB(115, 115, 115)));

  aList.AppendToBottom(new (&aBuilder)

    nsDisplaySolidColor(&aBuilder, aFrame, aBounds, NS_RGB(115, 115, 115)));

}



static bool
@@ -5308,7 +5308,7 @@ PresShell::AddCanvasBackgroundColorItem(nsDisplayListBuilder& aBuilder, 


  if (!addedScrollingBackgroundColor || forceUnscrolledItem) {

    aList.AppendToBottom(

      MakeDisplayItem<nsDisplaySolidColor>(&aBuilder, aFrame, aBounds, bgcolor));

      new (&aBuilder) nsDisplaySolidColor(&aBuilder, aFrame, aBounds, bgcolor));

  }

}

layout/base/nsLayoutUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3021,7 +3021,7 @@ nsLayoutUtils::GetLayerTransformForFrame(nsIFrame* aFrame, 
  builder.BeginFrame();

  nsDisplayList list;

  nsDisplayTransform* item =

    MakeDisplayItem<nsDisplayTransform>(&builder, aFrame, &list, nsRect());

    new (&builder) nsDisplayTransform(&builder, aFrame, &list, nsRect());



  *aTransform = item->GetTransform();

  item->Destroy(&builder);

layout/forms/nsButtonFrameRenderer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -477,8 +477,8 @@ nsButtonFrameRenderer::DisplayButton(nsDisplayListBuilder* aBuilder, 
                                     nsDisplayList* aForeground)

{

  if (mFrame->StyleEffects()->mBoxShadow) {

    aBackground->AppendToTop(

      MakeDisplayItem<nsDisplayButtonBoxShadowOuter>(aBuilder, this));

    aBackground->AppendToTop(new (aBuilder)

      nsDisplayButtonBoxShadowOuter(aBuilder, this));

  }



  nsRect buttonRect = mFrame->GetRectRelativeToSelf();
@@ -486,14 +486,14 @@ nsButtonFrameRenderer::DisplayButton(nsDisplayListBuilder* aBuilder, 
  nsDisplayBackgroundImage::AppendBackgroundItemsToTop(

    aBuilder, mFrame, buttonRect, aBackground);



  aBackground->AppendToTop(

    MakeDisplayItem<nsDisplayButtonBorder>(aBuilder, this));

  aBackground->AppendToTop(new (aBuilder)

    nsDisplayButtonBorder(aBuilder, this));



  // Only display focus rings if we actually have them. Since at most one

  // button would normally display a focus ring, most buttons won't have them.

  if (mInnerFocusStyle && mInnerFocusStyle->StyleBorder()->HasBorder()) {

    aForeground->AppendToTop(

      MakeDisplayItem<nsDisplayButtonForeground>(aBuilder, this));

    aForeground->AppendToTop(new (aBuilder)

      nsDisplayButtonForeground(aBuilder, this));

  }

  return NS_OK;

}

layout/forms/nsComboboxControlFrame.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,7 @@ nsComboboxControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, 
           !presContext->GetTheme()->ThemeDrawsFocusForWidget(disp->mAppearance)) &&

          mDisplayFrame && IsVisibleForPainting(aBuilder)) {

        aLists.Content()->AppendToTop(

          MakeDisplayItem<nsDisplayComboboxFocus>(aBuilder, this));

          new (aBuilder) nsDisplayComboboxFocus(aBuilder, this));

      }

    }

  }

layout/forms/nsFieldSetFrame.cpp

+4 −4
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, 
  if (!(GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER) &&

      IsVisibleForPainting(aBuilder)) {

    if (StyleEffects()->mBoxShadow) {

      aLists.BorderBackground()->AppendToTop(

        MakeDisplayItem<nsDisplayBoxShadowOuter>(aBuilder, this));

      aLists.BorderBackground()->AppendToTop(new (aBuilder)

        nsDisplayBoxShadowOuter(aBuilder, this));

    }



    nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
@@ -205,8 +205,8 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, 
      aLists.BorderBackground(),

      /* aAllowWillPaintBorderOptimization = */ false);



    aLists.BorderBackground()->AppendToTop(

      MakeDisplayItem<nsDisplayFieldSetBorder>(aBuilder, this));

    aLists.BorderBackground()->AppendToTop(new (aBuilder)

      nsDisplayFieldSetBorder(aBuilder, this));



    DisplayOutlineUnconditional(aBuilder, aLists);