From 9eac0ede5beb90b2fc884e4acd92189e2afa5048 Mon Sep 17 00:00:00 2001 From: "caillon%returnzero.com" Date: Fri, 17 Jan 2003 12:16:36 +0000 Subject: [PATCH] Fix build bustage. OS/2 and Sun Workshop won't do implicit type conversions (like .get() on an nsCOMPtr) while trying to match a template. See also revision 3.188 of this file. git-svn-id: svn://10.0.0.236/trunk@136508 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSRendering.cpp | 5 ++++- mozilla/layout/html/style/src/nsCSSRendering.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp index a766973cadd..627916d8edd 100644 --- a/mozilla/layout/base/nsCSSRendering.cpp +++ b/mozilla/layout/base/nsCSSRendering.cpp @@ -2614,7 +2614,10 @@ FindCanvasBackground(nsIPresContext* aPresContext, while(firstChild){ for (nsIFrame* kidFrame = firstChild; nsnull != kidFrame; ) { kidFrame->GetStyleContext(getter_AddRefs(parentContext)); - ::GetStyleData(parentContext, &result); + // Need to .get() because some compilers will not do the + // implicit .get() to match the template. + // See also rev 3.188 of this file. + ::GetStyleData(parentContext.get(), &result); if (!result->IsTransparent()) { GetStyleData(kidFrame, aBackground); return PR_TRUE; diff --git a/mozilla/layout/html/style/src/nsCSSRendering.cpp b/mozilla/layout/html/style/src/nsCSSRendering.cpp index a766973cadd..627916d8edd 100644 --- a/mozilla/layout/html/style/src/nsCSSRendering.cpp +++ b/mozilla/layout/html/style/src/nsCSSRendering.cpp @@ -2614,7 +2614,10 @@ FindCanvasBackground(nsIPresContext* aPresContext, while(firstChild){ for (nsIFrame* kidFrame = firstChild; nsnull != kidFrame; ) { kidFrame->GetStyleContext(getter_AddRefs(parentContext)); - ::GetStyleData(parentContext, &result); + // Need to .get() because some compilers will not do the + // implicit .get() to match the template. + // See also rev 3.188 of this file. + ::GetStyleData(parentContext.get(), &result); if (!result->IsTransparent()) { GetStyleData(kidFrame, aBackground); return PR_TRUE;