42 lines
1.4 KiB
Text
42 lines
1.4 KiB
Text
commit a13d95795217
|
|
Author: <tharvik@gmail.com>
|
|
Date: Thu Dec 8 18:20:12 2016 -0600
|
|
|
|
Bug 1321877. Fix compiler warnings in Downscaler.h when skia is not enabled. r=tnikkel
|
|
---
|
|
image/Downscaler.h | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git image/Downscaler.h image/Downscaler.h
|
|
index 21179a38f200..0bdef0eaa646 100644
|
|
--- mozilla/image/Downscaler.h
|
|
+++ mozilla/image/Downscaler.h
|
|
@@ -154,14 +154,14 @@ private:
|
|
class Downscaler
|
|
{
|
|
public:
|
|
- explicit Downscaler(const nsIntSize&)
|
|
+ explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0)
|
|
{
|
|
MOZ_RELEASE_ASSERT(false, "Skia is not enabled");
|
|
}
|
|
|
|
- const nsIntSize& OriginalSize() const { return nsIntSize(); }
|
|
- const nsIntSize& TargetSize() const { return nsIntSize(); }
|
|
- const gfxSize& Scale() const { return gfxSize(1.0, 1.0); }
|
|
+ const nsIntSize& OriginalSize() const { return mSize; }
|
|
+ const nsIntSize& TargetSize() const { return mSize; }
|
|
+ const gfxSize& Scale() const { return mScale; }
|
|
|
|
nsresult BeginFrame(const nsIntSize&, const Maybe<nsIntRect>&, uint8_t*, bool, bool = false)
|
|
{
|
|
@@ -177,6 +177,9 @@ public:
|
|
DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
|
|
void ResetForNextProgressivePass() { }
|
|
const nsIntSize FrameSize() const { return nsIntSize(0, 0); }
|
|
+private:
|
|
+ nsIntSize mSize;
|
|
+ gfxSize mScale;
|
|
};
|
|
|
|
#endif // MOZ_ENABLE_SKIA
|