This is a better fix for the build bustage caused by the checkin for bug 294086. Thanks to Peter Annema for explaining the issue (don't assign to rvalues) and this fix.
git-svn-id: svn://10.0.0.236/trunk@239604 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1735,7 +1735,7 @@ IsAutoHeight(const nsStyleCoord &aCoord, nscoord aCBHeight)
|
||||
/* static */ nsSize
|
||||
nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
|
||||
nsIRenderingContext* aRenderingContext, nsIFrame* aFrame,
|
||||
nsIFrame::IntrinsicSize aIntrinsicSize,
|
||||
const nsIFrame::IntrinsicSize& aIntrinsicSize,
|
||||
nsSize aIntrinsicRatio, nsSize aCBSize,
|
||||
nsSize aMargin, nsSize aBorder, nsSize aPadding)
|
||||
{
|
||||
|
||||
@@ -626,7 +626,7 @@ public:
|
||||
*/
|
||||
static nsSize ComputeSizeWithIntrinsicDimensions(
|
||||
nsIRenderingContext* aRenderingContext, nsIFrame* aFrame,
|
||||
nsIFrame::IntrinsicSize aIntrinsicSize,
|
||||
const nsIFrame::IntrinsicSize& aIntrinsicSize,
|
||||
nsSize aIntrinsicRatio, nsSize aCBSize,
|
||||
nsSize aMargin, nsSize aBorder, nsSize aPadding);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user