Change CSW inheritance to BlockFrame from ContainerFrame draft
authorNeerja Pancholi <npancholi@mozilla.com>
Tue, 07 Nov 2017 14:41:10 -0800
changeset 698710 bf74488c60d31cf4a948252a9683c719bb77ff24
parent 698709 6651d9ef742454d75abc22bcb596a19d0d4a98e9
child 698711 d18ad78aff6ea2962b0791d744aaeacfba13cbe0
push id89334
push userbmo:npancholi@mozilla.com
push dateThu, 16 Nov 2017 00:39:30 +0000
milestone59.0a1
Change CSW inheritance to BlockFrame from ContainerFrame MozReview-Commit-ID: Hirsqwjoyjl
layout/generic/nsColumnSetWrapperFrame.cpp
layout/generic/nsColumnSetWrapperFrame.h
--- a/layout/generic/nsColumnSetWrapperFrame.cpp
+++ b/layout/generic/nsColumnSetWrapperFrame.cpp
@@ -19,17 +19,17 @@ NS_NewColumnSetWrapperFrame(nsIPresShell
     new (aPresShell) nsColumnSetWrapperFrame(aContext);
   frame->AddStateBits(aStateFlags | NS_BLOCK_MARGIN_ROOT);
   return frame;
 }
 
 NS_IMPL_FRAMEARENA_HELPERS(nsColumnSetWrapperFrame)
 
 nsColumnSetWrapperFrame::nsColumnSetWrapperFrame(nsStyleContext* aContext)
-: nsContainerFrame(aContext, kClassID)
+: nsBlockFrame(aContext, kClassID)
 {
 }
 
 nscoord
 nsColumnSetWrapperFrame::GetMinISize(gfxContext* aRenderingContext)
 {
   nscoord minISize = 0;
   DISPLAY_MIN_WIDTH(this, minISize);
--- a/layout/generic/nsColumnSetWrapperFrame.h
+++ b/layout/generic/nsColumnSetWrapperFrame.h
@@ -14,17 +14,17 @@
 /* This class is a wrapper for nsColumnSetFrames and column-span elements i.e.
  * spanners. Essentially, we divide the *original* nsColumnSetFrame
  * into multiple nsColumnSetFrames on the basis of the number and position of
  * spanning elements.
  * This wrapper is necessary for implementing column-span as it allows us to
  * maintain each nsColumnSetFrame as an independent set of columns and each
  * spanning element then becomes just a block level element.
  */
-class nsColumnSetWrapperFrame final : public nsContainerFrame
+class nsColumnSetWrapperFrame final : public nsBlockFrame
 {
 public:
   NS_DECL_FRAMEARENA_HELPERS(nsColumnSetWrapperFrame)
 
   friend nsContainerFrame* NS_NewColumnSetWrapperFrame(nsIPresShell* aPresShell,
                                                        nsStyleContext* aContext,
                                                        nsFrameState aStateFlags);
   void BuildDisplayList(nsDisplayListBuilder*   aBuilder,