Make sure DidSetStyleContext methods call the base class DidSetStyleContext, and change the signature to return void. (Bug 459649) r+sr=bzbarsky

layout/generic/nsBulletFrame.cpp

@@ -132,9 +132,11 @@ nsBulletFrame::IsSelfEmpty()
   return GetStyleList()->mListStyleType == NS_STYLE_LIST_STYLE_NONE;
 }
 
-NS_IMETHODIMP
+/* virtual */ void
 nsBulletFrame::DidSetStyleContext()
 {
+  nsFrame::DidSetStyleContext();
+
   imgIRequest *newRequest = GetStyleList()->mListStyleImage;
 
   if (newRequest) {
@@ -179,8 +181,6 @@ nsBulletFrame::DidSetStyleContext()
       mImageRequest = nsnull;
     }
   }
-
-  return NS_OK;
 }
 
 class nsDisplayBullet : public nsDisplayItem {

layout/generic/nsBulletFrame.h

@@ -62,7 +62,7 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
   virtual nsIAtom* GetType() const;
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 #ifdef NS_DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const;
 #endif

layout/generic/nsFrame.cpp

@@ -552,7 +552,8 @@ nsFrame::GetOffsets(PRInt32 &aStart, PRInt32 &aEnd) const
 }
 
 // Subclass hook for style post processing
-NS_IMETHODIMP nsFrame::DidSetStyleContext()
+/* virtual */ void
+nsFrame::DidSetStyleContext()
 {
   // Ensure that this frame gets invalidates (and, in the case of some
   // 'border-image's, reflows) when images that affect it load.
@@ -574,8 +575,6 @@ NS_IMETHODIMP nsFrame::DidSetStyleContext()
   }
 
   PresContext()->SetImageNotifiers(this, notifierChain);
-
-  return NS_OK;
 }
 
 /* virtual */ nsMargin

layout/generic/nsFrame.h

@@ -555,7 +555,7 @@ protected:
   PRInt16 DisplaySelection(nsPresContext* aPresContext, PRBool isOkToTurnOn = PR_FALSE);
   
   // Style post processing hook
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
 public:
   //given a frame five me the first/last leaf available

layout/generic/nsIFrame.h

@@ -633,7 +633,7 @@ public:
   }
 
   // Style post processing hook
-  NS_IMETHOD DidSetStyleContext() = 0;
+  virtual void DidSetStyleContext() = 0;
 
   /**
    * Get the style data associated with this frame.  This returns a

layout/generic/nsObjectFrame.cpp

@@ -633,7 +633,7 @@ nsObjectFrame::Destroy()
   nsObjectFrameSuper::Destroy();
 }
 
-NS_IMETHODIMP
+/* virtual */ void
 nsObjectFrame::DidSetStyleContext()
 {
   if (HasView()) {
@@ -646,7 +646,7 @@ nsObjectFrame::DidSetStyleContext()
     }
   }
 
-  return nsObjectFrameSuper::DidSetStyleContext();
+  nsObjectFrameSuper::DidSetStyleContext();
 }
 
 nsIAtom*

layout/generic/nsObjectFrame.h

@@ -102,7 +102,7 @@ public:
 
   virtual void Destroy();
 
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   NS_IMETHOD GetPluginInstance(nsIPluginInstance*& aPluginInstance);
   virtual nsresult Instantiate(nsIChannel* aChannel, nsIStreamListener** aStreamListener);

layout/generic/nsTextFrame.h

@@ -90,7 +90,7 @@ public:
                                   nsIContent*     aChild,
                                   PRBool          aAppend);
                                   
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
   
   virtual nsIFrame* GetNextContinuation() const {
     return mNextContinuation;

layout/generic/nsTextFrameThebes.cpp

@@ -3624,11 +3624,11 @@ nsTextFrame::CharacterDataChanged(nsPresContext* aPresContext,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+/* virtual */ void
 nsTextFrame::DidSetStyleContext()
 {
+  nsFrame::DidSetStyleContext();
   ClearTextRun();
-  return NS_OK;
 } 
 
 class nsDisplayText : public nsDisplayItem {

layout/svg/base/src/nsSVGGlyphFrame.cpp

@@ -225,7 +225,7 @@ nsSVGGlyphFrame::CharacterDataChanged(nsPresContext*  aPresContext,
 #define CLAMP_MAX_SIZE 200
 #define PRECISE_SIZE   200
 
-NS_IMETHODIMP
+/* virtual */ void
 nsSVGGlyphFrame::DidSetStyleContext()
 {
   nsSVGGlyphFrameBase::DidSetStyleContext();
@@ -234,8 +234,6 @@ nsSVGGlyphFrame::DidSetStyleContext()
     ClearTextRun();
     NotifyGlyphMetricsChange();
   }
-
-  return NS_OK;
 }
 
 NS_IMETHODIMP

layout/svg/base/src/nsSVGGlyphFrame.h

@@ -81,7 +81,7 @@ public:
                                    nsIContent*     aChild,
                                    PRBool          aAppend);
 
-  NS_IMETHOD  DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   NS_IMETHOD  SetSelected(nsPresContext* aPresContext,
                           nsIDOMRange*    aRange,

layout/svg/base/src/nsSVGGradientFrame.cpp

@@ -63,11 +63,11 @@ nsSVGGradientFrame::nsSVGGradientFrame(nsStyleContext* aContext) :
 //----------------------------------------------------------------------
 // nsIFrame methods:
 
-NS_IMETHODIMP
+/* virtual */ void
 nsSVGGradientFrame::DidSetStyleContext()
 {
   nsSVGEffects::InvalidateRenderingObservers(this);
-  return nsSVGGradientFrameBase::DidSetStyleContext();
+  nsSVGGradientFrameBase::DidSetStyleContext();
 }
 
 NS_IMETHODIMP

layout/svg/base/src/nsSVGGradientFrame.h

@@ -65,7 +65,7 @@ public:
                                   float aGraphicOpacity);
 
   // nsIFrame interface:
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   NS_IMETHOD AttributeChanged(PRInt32         aNameSpaceID,
                               nsIAtom*        aAttribute,

layout/svg/base/src/nsSVGLeafFrame.cpp

@@ -57,7 +57,7 @@ public:
   }
 #endif
 
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 };
 
 nsIFrame*
@@ -66,10 +66,9 @@ NS_NewSVGLeafFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
   return new (aPresShell) nsSVGLeafFrame(aContext);
 }
 
-NS_IMETHODIMP
+/* virtual */ void
 nsSVGLeafFrame::DidSetStyleContext()
 {
-  nsresult rv = nsFrame::DidSetStyleContext();
+  nsFrame::DidSetStyleContext();
   nsSVGEffects::InvalidateRenderingObservers(this);
-  return rv;
 }

layout/svg/base/src/nsSVGPathGeometryFrame.cpp

@@ -83,7 +83,7 @@ nsSVGPathGeometryFrame::AttributeChanged(PRInt32         aNameSpaceID,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+/* virtual */ void
 nsSVGPathGeometryFrame::DidSetStyleContext()
 {
   nsSVGPathGeometryFrameBase::DidSetStyleContext();
@@ -101,8 +101,6 @@ nsSVGPathGeometryFrame::DidSetStyleContext()
   // best place to deal with style changes:
 
   nsSVGUtils::UpdateGraphic(this);
-
-  return NS_OK;
 }
 
 nsIAtom *

layout/svg/base/src/nsSVGPathGeometryFrame.h

@@ -80,7 +80,7 @@ public:
                                nsIAtom*        aAttribute,
                                PRInt32         aModType);
 
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   /**
    * Get the "type" of the frame

layout/svg/base/src/nsSVGPatternFrame.cpp

@@ -76,11 +76,11 @@ nsSVGPatternFrame::nsSVGPatternFrame(nsStyleContext* aContext) :
 //----------------------------------------------------------------------
 // nsIFrame methods:
 
-NS_IMETHODIMP
+/* virtual */ void
 nsSVGPatternFrame::DidSetStyleContext()
 {
   nsSVGEffects::InvalidateRenderingObservers(this);
-  return nsSVGPatternFrameBase::DidSetStyleContext();
+  nsSVGPatternFrameBase::DidSetStyleContext();
 }
 
 NS_IMETHODIMP

layout/svg/base/src/nsSVGPatternFrame.h

@@ -80,7 +80,7 @@ public:
   virtual already_AddRefed<nsIDOMSVGMatrix> GetCanvasTM();
 
   // nsIFrame interface:
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   NS_IMETHOD AttributeChanged(PRInt32         aNameSpaceID,
                               nsIAtom*        aAttribute,

layout/svg/base/src/nsSVGStopFrame.cpp

@@ -58,7 +58,7 @@ protected:
 
 public:
   // nsIFrame interface:
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   NS_IMETHOD AttributeChanged(PRInt32         aNameSpaceID,
                               nsIAtom*        aAttribute,
@@ -91,12 +91,11 @@ public:
 //----------------------------------------------------------------------
 // nsIFrame methods:
 
-NS_IMETHODIMP
+/* virtual */ void
 nsSVGStopFrame::DidSetStyleContext()
 {
   nsSVGStopFrameBase::DidSetStyleContext();
   nsSVGEffects::InvalidateRenderingObservers(this);
-  return NS_OK;
 }
 
 nsIAtom *

layout/xul/base/src/nsBoxFrame.cpp

@@ -179,14 +179,14 @@ nsBoxFrame::SetInitialChildList(nsIAtom*        aListName,
   return r;
 }
 
-NS_IMETHODIMP
+/* virtual */ void
 nsBoxFrame::DidSetStyleContext()
 {
+  nsContainerFrame::DidSetStyleContext();
+
   // The values that CacheAttributes() computes depend on our style,
   // so we need to recompute them here...
   CacheAttributes();
-
-  return NS_OK;
 }
 
 /**

layout/xul/base/src/nsBoxFrame.h

@@ -139,7 +139,7 @@ public:
   NS_IMETHOD  SetInitialChildList(nsIAtom*        aListName,
                                   nsIFrame*       aChildList);
 
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   virtual nsIAtom* GetType() const;
 

layout/xul/base/src/nsImageBoxFrame.cpp

@@ -389,21 +389,23 @@ nsImageBoxFrame::PaintImage(nsIRenderingContext& aRenderingContext,
 //
 // When the style context changes, make sure that all of our image is up to date.
 //
-NS_IMETHODIMP
+/* virtual */ void
 nsImageBoxFrame::DidSetStyleContext()
 {
+  nsLeafBoxFrame::DidSetStyleContext();
+
   // Fetch our subrect.
   const nsStyleList* myList = GetStyleList();
   mSubRect = myList->mImageRegion; // before |mSuppressStyleCheck| test!
 
   if (mUseSrcAttr || mSuppressStyleCheck)
-    return NS_OK; // No more work required, since the image isn't specified by style.
+    return; // No more work required, since the image isn't specified by style.
 
   // If we're using a native theme implementation, we shouldn't draw anything.
   const nsStyleDisplay* disp = GetStyleDisplay();
   if (disp->mAppearance && nsBox::gTheme && 
       nsBox::gTheme->ThemeSupportsWidget(nsnull, this, disp->mAppearance))
-    return NS_OK;
+    return;
 
   // If list-style-image changes, we have a new image.
   nsCOMPtr<nsIURI> oldURI, newURI;
@@ -415,10 +417,9 @@ nsImageBoxFrame::DidSetStyleContext()
   if (newURI == oldURI ||   // handles null==null
       (newURI && oldURI &&
        NS_SUCCEEDED(newURI->Equals(oldURI, &equal)) && equal))
-    return NS_OK;
+    return;
 
   UpdateImage();
-  return NS_OK;
 } // DidSetStyleContext
 
 void

layout/xul/base/src/nsImageBoxFrame.h

@@ -90,7 +90,7 @@ public:
                               nsIAtom* aAttribute,
                               PRInt32 aModType);
 
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   virtual void Destroy();
 

layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp

@@ -4218,9 +4218,11 @@ nsTreeBodyFrame::ClearStyleAndImageCaches()
   return NS_OK;
 }
 
-NS_IMETHODIMP
+/* virtual */ void
 nsTreeBodyFrame::DidSetStyleContext()
 {
+  nsLeafBoxFrame::DidSetStyleContext();
+
   // Clear the style cache; the pointers are no longer even valid
   mStyleCache.Clear();
   // XXX The following is hacky, but it's not incorrect,
@@ -4229,7 +4231,6 @@ nsTreeBodyFrame::DidSetStyleContext()
   mIndentation = GetIndentation();
   mRowHeight = GetRowHeight();
   mStringWidth = -1;
-  return NS_OK;
 }
 
 PRBool 

layout/xul/base/src/tree/src/nsTreeBodyFrame.h

@@ -121,7 +121,7 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
 
-  NS_IMETHOD DidSetStyleContext();
+  virtual void DidSetStyleContext();
 
   friend nsIFrame* NS_NewTreeBodyFrame(nsIPresShell* aPresShell);
   friend class nsTreeColumn;