Bug 1083393 - Remove unused thebes things in nsLayoutUtils, r=mattwoodrow
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -9,16 +9,17 @@
#define nsCSSRendering_h___
#include "gfxBlur.h"
#include "gfxContext.h"
#include "nsLayoutUtils.h"
#include "nsStyleStruct.h"
#include "nsIFrame.h"
+class gfxDrawable;
class nsStyleContext;
class nsPresContext;
class nsRenderingContext;
namespace mozilla {
namespace layers {
class ImageContainer;
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -42,18 +42,16 @@ class nsRegion;
class nsDisplayListBuilder;
class nsDisplayItem;
class nsFontMetrics;
class nsFontFaceList;
class nsIImageLoadingContent;
class nsStyleContext;
class nsBlockFrame;
class nsContainerFrame;
-class gfxASurface;
-class gfxDrawable;
class nsView;
class nsIFrame;
class nsStyleCoord;
class nsStyleCorners;
class gfxContext;
class nsPIDOMWindow;
class imgIRequest;
class nsIDocument;
@@ -1708,17 +1706,17 @@ public:
* Some frames with 'position: fixed' (nsStylePosition::mDisplay ==
* NS_STYLE_POSITION_FIXED) are not really fixed positioned, since
* they're inside an element with -moz-transform. This function says
* whether such an element is a real fixed-pos element.
*/
static bool IsReallyFixedPos(nsIFrame* aFrame);
/**
- * Obtain a gfxASurface from the given DOM element, if possible.
+ * Obtain a SourceSurface from the given DOM element, if possible.
* This obtains the most natural surface from the element; that
* is, the one that can be obtained with the fewest conversions.
*
* The flags below can modify the behaviour of this function. The
* result is returned as a SurfaceFromElementResult struct, also
* defined below.
*
* Currently, this will do:
@@ -1754,18 +1752,17 @@ public:
uint32_t mWhichFrame;
/* imgIContainer flags to use when drawing */
uint32_t mDrawingFlags;
};
struct SurfaceFromElementResult {
SurfaceFromElementResult();
- /* mSurface will contain the resulting surface, or will be nullptr on error */
- nsRefPtr<gfxASurface> mSurface;
+ /* mSourceSurface will contain the resulting surface, or will be nullptr on error */
mozilla::RefPtr<SourceSurface> mSourceSurface;
/* Contains info for drawing when there is no mSourceSurface. */
DirectDrawInfo mDrawInfo;
/* The size of the surface */
gfxIntSize mSize;
/* The principal associated with the element whose surface was returned.
If there is a surface, this will never be null. */