From bb49e8220e056ae382fe30c8e6e026087cdf22ff Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Thu, 26 Jan 2006 05:14:30 +0000 Subject: [PATCH] Fixing more build bustage and warnings. Bug 317375 git-svn-id: svn://10.0.0.236/trunk@188218 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsDisplayList.h | 3 ++- mozilla/layout/generic/nsImageFrame.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/base/nsDisplayList.h b/mozilla/layout/base/nsDisplayList.h index 850bb8a6cb3..01efeca3329 100644 --- a/mozilla/layout/base/nsDisplayList.h +++ b/mozilla/layout/base/nsDisplayList.h @@ -563,7 +563,8 @@ private: * The lists themselves are external to this object and thus can be shared * with others. Some of the list pointers may even refer to the same list. */ -struct nsDisplayListSet { +class nsDisplayListSet { +public: /** * @return a list where one should place the border and/or background for * this frame (everything from steps 1 and 2 of CSS 2.1 appendix E) diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 8733f942304..b421639ba9f 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -1263,7 +1263,7 @@ class nsDisplayImage : public nsDisplayItem { public: nsDisplayImage(nsImageFrame* aFrame, imgIContainer* aImage) : mFrame(aFrame), mImage(aImage) {} - virtual nsImageFrame* GetUnderlyingFrame() { return mFrame; } + virtual nsIFrame* GetUnderlyingFrame() { return mFrame; } virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect); NS_DISPLAY_DECL_NAME("Image")