Commit 2c5cb151 authored by Miko Mynttinen's avatar Miko Mynttinen
Browse files

Bug 1549751 - Part 2: Add nsPaintedDisplayItem r=mattwoodrow 

Move ApplyOpacity(), CanApplyOpacity(), Paint() and PaintWithClip() methods to nsPaintedDisplayItem

Differential Revision: https://phabricator.services.mozilla.com/D30225

--HG--
extra : moz-landing-system : lando
parent d31f4467

layout/forms/nsButtonFrameRenderer.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -60,11 +60,11 @@ bool nsButtonFrameRenderer::isDisabled() { 
      NS_EVENT_STATE_DISABLED);

      NS_EVENT_STATE_DISABLED);

}

}





class nsDisplayButtonBoxShadowOuter : public nsDisplayItem {

class nsDisplayButtonBoxShadowOuter : public nsPaintedDisplayItem {

 public:

 public:

  nsDisplayButtonBoxShadowOuter(nsDisplayListBuilder* aBuilder,

  nsDisplayButtonBoxShadowOuter(nsDisplayListBuilder* aBuilder,

                                nsIFrame* aFrame)

                                nsIFrame* aFrame)

      : nsDisplayItem(aBuilder, aFrame) {

      : nsPaintedDisplayItem(aBuilder, aFrame) {

    MOZ_COUNT_CTOR(nsDisplayButtonBoxShadowOuter);

    MOZ_COUNT_CTOR(nsDisplayButtonBoxShadowOuter);

  }

  }

#ifdef NS_BUILD_REFCNT_LOGGING

#ifdef NS_BUILD_REFCNT_LOGGING
@@ -184,11 +184,11 @@ bool nsDisplayButtonBoxShadowOuter::CreateWebRenderCommands( 
  return true;

  return true;

}

}





class nsDisplayButtonBorder final : public nsDisplayItem {

class nsDisplayButtonBorder final : public nsPaintedDisplayItem {

 public:

 public:

  nsDisplayButtonBorder(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,

  nsDisplayButtonBorder(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,

                        nsButtonFrameRenderer* aRenderer)

                        nsButtonFrameRenderer* aRenderer)

      : nsDisplayItem(aBuilder, aFrame), mBFR(aRenderer) {

      : nsPaintedDisplayItem(aBuilder, aFrame), mBFR(aRenderer) {

    MOZ_COUNT_CTOR(nsDisplayButtonBorder);

    MOZ_COUNT_CTOR(nsDisplayButtonBorder);

  }

  }

#ifdef NS_BUILD_REFCNT_LOGGING

#ifdef NS_BUILD_REFCNT_LOGGING
@@ -290,11 +290,11 @@ nsRect nsDisplayButtonBorder::GetBounds(nsDisplayListBuilder* aBuilder, 
                   ToReferenceFrame();

                   ToReferenceFrame();

}

}





class nsDisplayButtonForeground final : public nsDisplayItem {

class nsDisplayButtonForeground final : public nsPaintedDisplayItem {

 public:

 public:

  nsDisplayButtonForeground(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,

  nsDisplayButtonForeground(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,

                            nsButtonFrameRenderer* aRenderer)

                            nsButtonFrameRenderer* aRenderer)

      : nsDisplayItem(aBuilder, aFrame), mBFR(aRenderer) {

      : nsPaintedDisplayItem(aBuilder, aFrame), mBFR(aRenderer) {

    MOZ_COUNT_CTOR(nsDisplayButtonForeground);

    MOZ_COUNT_CTOR(nsDisplayButtonForeground);

  }

  }

#ifdef NS_BUILD_REFCNT_LOGGING

#ifdef NS_BUILD_REFCNT_LOGGING

layout/forms/nsComboboxControlFrame.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1421,11 +1421,11 @@ int32_t nsComboboxControlFrame::UpdateRecentIndex(int32_t aIndex) { 
  return index;

  return index;

}

}





class nsDisplayComboboxFocus : public nsDisplayItem {

class nsDisplayComboboxFocus : public nsPaintedDisplayItem {

 public:

 public:

  nsDisplayComboboxFocus(nsDisplayListBuilder* aBuilder,

  nsDisplayComboboxFocus(nsDisplayListBuilder* aBuilder,

                         nsComboboxControlFrame* aFrame)

                         nsComboboxControlFrame* aFrame)

      : nsDisplayItem(aBuilder, aFrame) {

      : nsPaintedDisplayItem(aBuilder, aFrame) {

    MOZ_COUNT_CTOR(nsDisplayComboboxFocus);

    MOZ_COUNT_CTOR(nsDisplayComboboxFocus);

  }

  }

#ifdef NS_BUILD_REFCNT_LOGGING

#ifdef NS_BUILD_REFCNT_LOGGING

layout/forms/nsFieldSetFrame.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -90,11 +90,11 @@ nsIFrame* nsFieldSetFrame::GetLegend() const { 
  return mFrames.FirstChild();

  return mFrames.FirstChild();

}

}





class nsDisplayFieldSetBorder final : public nsDisplayItem {

class nsDisplayFieldSetBorder final : public nsPaintedDisplayItem {

 public:

 public:

  nsDisplayFieldSetBorder(nsDisplayListBuilder* aBuilder,

  nsDisplayFieldSetBorder(nsDisplayListBuilder* aBuilder,

                          nsFieldSetFrame* aFrame)

                          nsFieldSetFrame* aFrame)

      : nsDisplayItem(aBuilder, aFrame) {

      : nsPaintedDisplayItem(aBuilder, aFrame) {

    MOZ_COUNT_CTOR(nsDisplayFieldSetBorder);

    MOZ_COUNT_CTOR(nsDisplayFieldSetBorder);

  }

  }

#ifdef NS_BUILD_REFCNT_LOGGING

#ifdef NS_BUILD_REFCNT_LOGGING

layout/forms/nsRangeFrame.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -148,10 +148,10 @@ void nsRangeFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements, 
  }

  }

}

}





class nsDisplayRangeFocusRing final : public nsDisplayItem {

class nsDisplayRangeFocusRing final : public nsPaintedDisplayItem {

 public:

 public:

  nsDisplayRangeFocusRing(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)

  nsDisplayRangeFocusRing(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)

      : nsDisplayItem(aBuilder, aFrame) {

      : nsPaintedDisplayItem(aBuilder, aFrame) {

    MOZ_COUNT_CTOR(nsDisplayRangeFocusRing);

    MOZ_COUNT_CTOR(nsDisplayRangeFocusRing);

  }

  }

#ifdef NS_BUILD_REFCNT_LOGGING

#ifdef NS_BUILD_REFCNT_LOGGING

layout/forms/nsSelectsAreaFrame.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -100,10 +100,10 @@ static nsListControlFrame* GetEnclosingListFrame(nsIFrame* aSelectsAreaFrame) { 
  return nullptr;

  return nullptr;

}

}





class nsDisplayListFocus : public nsDisplayItem {

class nsDisplayListFocus : public nsPaintedDisplayItem {

 public:

 public:

  nsDisplayListFocus(nsDisplayListBuilder* aBuilder, nsSelectsAreaFrame* aFrame)

  nsDisplayListFocus(nsDisplayListBuilder* aBuilder, nsSelectsAreaFrame* aFrame)

      : nsDisplayItem(aBuilder, aFrame) {

      : nsPaintedDisplayItem(aBuilder, aFrame) {

    MOZ_COUNT_CTOR(nsDisplayListFocus);

    MOZ_COUNT_CTOR(nsDisplayListFocus);

  }

  }

#ifdef NS_BUILD_REFCNT_LOGGING

#ifdef NS_BUILD_REFCNT_LOGGING