From b7acb97adc19c4bf0d60ee44aa82d9b785943700 Mon Sep 17 00:00:00 2001 From: "jwatt%jwatt.org" Date: Sun, 18 Nov 2007 14:22:55 +0000 Subject: [PATCH] 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 --- mozilla/layout/base/nsLayoutUtils.cpp | 2 +- mozilla/layout/base/nsLayoutUtils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/base/nsLayoutUtils.cpp b/mozilla/layout/base/nsLayoutUtils.cpp index 75aabe33b14..0ecde8256f2 100644 --- a/mozilla/layout/base/nsLayoutUtils.cpp +++ b/mozilla/layout/base/nsLayoutUtils.cpp @@ -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) { diff --git a/mozilla/layout/base/nsLayoutUtils.h b/mozilla/layout/base/nsLayoutUtils.h index fcd1e0a8adc..0653ade82b1 100644 --- a/mozilla/layout/base/nsLayoutUtils.h +++ b/mozilla/layout/base/nsLayoutUtils.h @@ -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);