auto import from //branches/cupcake/...@127101

1 files changed, 8 insertions, 12 deletions

diff --git a/WebKit/android/RenderSkinCombo.h b/WebKit/android/RenderSkinCombo.h
index aeea6a0..0970b6b 100644
--- a/WebKit/android/RenderSkinCombo.h
+++ b/WebKit/android/RenderSkinCombo.h
@@ -27,10 +27,10 @@
 #define RenderSkinCombo_h
 
 #include "RenderSkinAndroid.h"
-#include "SkBitmap.h"
-#include "SkPaint.h"
 #include "SkRect.h"
 
+class SkCanvas;
+
 namespace WebCore {
 
 // This is very similar to RenderSkinButton - maybe they should be the same class?
@@ -45,21 +45,17 @@ public:
      */
     static void Init(android::AssetManager*);
 
-    virtual bool draw(PlatformGraphicsContext*);
-    virtual void notifyState(Node* element);
-    virtual void setDim(int width, int height);
+    /**
+     * Draw the provided Node on the SkCanvas, using the dimensions provided by
+     * x,y,w,h.  Return true if we did not draw, and WebKit needs to draw it,
+     * false otherwise.
+     */
+    static bool Draw(SkCanvas* , Node* , int x, int y, int w, int h);
 
     // The image is an extra 30 pixels wider than the RenderObject, so this accounts for that.
     static int extraWidth() { return arrowMargin; }
     
 private:
-    SkRect m_bounds;    // Maybe this should become a protected member of RenderSkinAndroid...
-    static SkBitmap m_bitmap[2];    // Collection of assets for a combo box
-    static bool     m_decoded;      // True if all assets were decoded
-    SkPaint m_paint;
-    // Could probably move m_state into RenderSkinAndroid...
-    // Although notice that the state for RenderSkinRadio is just an integer, and it behaves differently
-    State m_state;
     
     static const int arrowMargin = 30;
 };