Merge "Lazily decode assets for form controls."

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebKit/android/RenderSkinButton.h b/Source/WebKit/android/RenderSkinButton.h
index e9db74c..83c57dd 100644
--- a/Source/WebKit/android/RenderSkinButton.h
+++ b/Source/WebKit/android/RenderSkinButton.h
@@ -36,19 +36,19 @@ class IntRect;
 
 class RenderSkinButton {
 public:
-    /**
-     * Initialize the class before use. Uses the AssetManager to initialize any 
-     * bitmaps the class may use.
-     */
-    RenderSkinButton(android::AssetManager*, String drawableDirectory);
+    RenderSkinButton(String drawableDirectory);
     /**
      * 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.
      */
-    void draw(SkCanvas* , const IntRect& , RenderSkinAndroid::State) const;
+    void draw(SkCanvas* , const IntRect& , RenderSkinAndroid::State);
+
+    void decode();
 private:
     bool m_decoded;
+    bool m_decodingAttempted;
     NinePatch m_buttons[4];
+    String m_drawableDirectory;
 };
 
 } // WebCore