Bug 613659 - Make GetBorderRadii non-inline to make it compile on Windows. r=roc
authorMats Palmgren <matspal@gmail.com>
Mon, 05 May 2014 17:55:55 +0000
changeset 181576 48070863848c
parent 181575 a6040f41e340
child 181577 06da59d29a48
push id26724
push userkwierso@gmail.com
push dateTue, 06 May 2014 03:51:22 +0000
treeherdermozilla-central@6d991528460d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs613659
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 613659 - Make GetBorderRadii non-inline to make it compile on Windows. r=roc
layout/generic/nsFrame.cpp
layout/generic/nsIFrame.h
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1297,16 +1297,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.