Remove usages of getCanvas

 Everything goes through either PlatformGraphicsContext or recordingCanvas()

Change-Id: I375a4294d2e8d4b467b70c6b8a7f0b96f402f252

1 files changed, 25 insertions, 9 deletions

diff --git a/Source/WebKit/android/RenderSkinMediaButton.h b/Source/WebKit/android/RenderSkinMediaButton.h
index 484b90c..98c9e04 100644
--- a/Source/WebKit/android/RenderSkinMediaButton.h
+++ b/Source/WebKit/android/RenderSkinMediaButton.h
@@ -26,27 +26,43 @@
 #ifndef RenderSkinMediaButton_h
 #define RenderSkinMediaButton_h
 
-#include "RenderSkinAndroid.h"
+#include "IntRect.h"
 
 class SkCanvas;
 
 namespace WebCore {
-class IntRect;
-class RenderObject;
 
 class RenderSkinMediaButton {
 public:
     static void Decode();
+
     /**
-     * Draw the skin to the canvas, using the rectangle for its bounds and the
-     * State to determine which skin to use, i.e. focused or not focused.
+     * Button types
      */
-    static void Draw(SkCanvas* , const IntRect& , int buttonType, bool translucent = false,
-                     RenderObject* o = 0, bool drawBackground = true);
+    typedef enum
+    {
+        PAUSE,
+        PLAY,
+        MUTE,
+        REWIND,
+        FORWARD,
+        FULLSCREEN,
+        SPINNER_OUTER,
+        SPINNER_INNER,
+        VIDEO,
+        BACKGROUND_SLIDER,
+        SLIDER_TRACK,
+        SLIDER_THUMB
+    } MediaButton;
+
     /**
-     * Button types
+     * Draw the skin to the canvas, using the rectangle for its bounds and the
+     * State to determine which skin to use, i.e. focused or not focused.
      */
-    enum { PAUSE, PLAY, MUTE, REWIND, FORWARD, FULLSCREEN, SPINNER_OUTER, SPINNER_INNER , VIDEO, BACKGROUND_SLIDER, SLIDER_TRACK, SLIDER_THUMB };
+    static void Draw(SkCanvas* canvas, const IntRect& rect, MediaButton buttonType,
+                     bool translucent = false, bool drawBackground = true,
+                     const IntRect& thumb = IntRect());
+
     /**
      * Slider dimensions
      */