Bug 1318573 - (Part 4) Move CanvasImageSmoothing to BasicRenderingContext2D. r?mstange
MozReview-Commit-ID: DuMNpsHGUid
--- a/dom/canvas/BasicRenderingContext2D.h
+++ b/dom/canvas/BasicRenderingContext2D.h
@@ -82,18 +82,28 @@ public:
void GetGlobalCompositeOperation(nsAString& aOp,
mozilla::ErrorResult& aError);
void SetGlobalCompositeOperation(const nsAString& aOp,
mozilla::ErrorResult& aError);
//
// CanvasImageSmoothing
//
- virtual bool ImageSmoothingEnabled() = 0;
- virtual void SetImageSmoothingEnabled(bool aImageSmoothingEnabled) = 0;
+ bool ImageSmoothingEnabled()
+ {
+ return CurrentState().imageSmoothingEnabled;
+ }
+
+ void SetImageSmoothingEnabled(bool aImageSmoothingEnabled)
+ {
+ if (aImageSmoothingEnabled != CurrentState().imageSmoothingEnabled) {
+ CurrentState().imageSmoothingEnabled = aImageSmoothingEnabled;
+ }
+ }
+
//
// CanvasFillStrokeStyles
//
virtual void GetStrokeStyle(
OwningStringOrCanvasGradientOrCanvasPattern& aValue) = 0;
virtual void SetStrokeStyle(
const StringOrCanvasGradientOrCanvasPattern& aValue) = 0;
--- a/dom/canvas/CanvasRenderingContext2D.h
+++ b/dom/canvas/CanvasRenderingContext2D.h
@@ -352,28 +352,16 @@ public:
}
void SetMozTextStyle(const nsAString& aMozTextStyle,
mozilla::ErrorResult& aError)
{
SetFont(aMozTextStyle, aError);
}
- bool ImageSmoothingEnabled() override
- {
- return CurrentState().imageSmoothingEnabled;
- }
-
- void SetImageSmoothingEnabled(bool aImageSmoothingEnabled) override
- {
- if (aImageSmoothingEnabled != CurrentState().imageSmoothingEnabled) {
- CurrentState().imageSmoothingEnabled = aImageSmoothingEnabled;
- }
- }
-
void DrawWindow(nsGlobalWindow& aWindow, double aX, double aY,
double aW, double aH,
const nsAString& aBgColor, uint32_t aFlags,
mozilla::ErrorResult& aError);
bool SwitchRenderingMode(RenderingMode aRenderingMode);
// Eventually this should be deprecated. Keeping for now to keep the binding functional.