Bug 613659 - Make GetBorderRadii non-inline to make it compile on Windows. r=dholbert
authorMats Palmgren <matspal@gmail.com>
Fri, 18 Apr 2014 23:01:24 +0000
changeset 179674 c2ff93dab24e661ab8edbe1ff7247a3a516a553f
parent 179673 f3cf8e3cccf65603bf502816c505652c1fe65e46
child 179675 57930faaf5d2c91b402e9d6d26b1c5e3d3469b0f
child 179778 4bc69199b7e1965805c4e9096913fbaf661731ff
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersdholbert
bugs613659
milestone31.0a1
Bug 613659 - Make GetBorderRadii non-inline to make it compile on Windows. r=dholbert
layout/generic/nsFrame.cpp
layout/generic/nsIFrame.h
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1299,16 +1299,23 @@ nsIFrame::GetBorderRadii(const nsSize& a
     return false;
   }
   return ComputeBorderRadii(StyleBorder()->mBorderRadius,
                             aFrameSize, aBorderArea,
                             aSkipSides, aRadii);
 }
 
 bool
+nsIFrame::GetBorderRadii(nscoord aRadii[8]) const
+{
+  nsSize sz = GetSize();
+  return GetBorderRadii(sz, sz, GetSkipSides(), aRadii);
+}
+
+bool
 nsIFrame::GetPaddingBoxBorderRadii(nscoord aRadii[8]) const
 {
   if (!GetBorderRadii(aRadii))
     return false;
   InsetBorderRadii(aRadii, GetUsedBorder());
   NS_FOR_CSS_HALF_CORNERS(corner) {
     if (aRadii[corner])
       return true;
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -1046,20 +1046,17 @@ public:
    * Indices into aRadii are the NS_CORNER_* constants in nsStyleConsts.h
    * aSkipSides is a union of SIDE_BIT_LEFT/RIGHT/TOP/BOTTOM bits that says
    * which side(s) to skip.
    */
   virtual bool GetBorderRadii(const nsSize& aFrameSize,
                               const nsSize& aBorderArea,
                               int aSkipSides,
                               nscoord aRadii[8]) const;
-  bool GetBorderRadii(nscoord aRadii[8]) const {
-    nsSize sz = GetSize();
-    return GetBorderRadii(sz, sz, GetSkipSides(), aRadii);
-  }
+  bool GetBorderRadii(nscoord aRadii[8]) const;
 
   bool GetPaddingBoxBorderRadii(nscoord aRadii[8]) const;
   bool GetContentBoxBorderRadii(nscoord aRadii[8]) const;
 
   /**
    * Get the position of the frame's baseline, relative to the top of
    * the frame (its top border edge).  Only valid when Reflow is not
    * needed.