Bug 1318573 - (Part 4) Move CanvasImageSmoothing to BasicRenderingContext2D. r?mstange draft
authorKevin Chen <kechen@mozilla.com>
Wed, 15 Feb 2017 12:14:00 +0800
changeset 499857 9b05cefe9033fed528e2aa40b921b2a39233a07d
parent 499856 ee4fc366511d7395c15dddd3dec45d403e5b9303
child 499858 2259232b69001a1b3725ccde275468e8923e8c5a
push id49564
push userbmo:kechen@mozilla.com
push dateThu, 16 Mar 2017 09:50:15 +0000
reviewersmstange
bugs1318573
milestone54.0a1
Bug 1318573 - (Part 4) Move CanvasImageSmoothing to BasicRenderingContext2D. r?mstange MozReview-Commit-ID: DuMNpsHGUid
dom/canvas/BasicRenderingContext2D.h
dom/canvas/CanvasRenderingContext2D.h
--- 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.