1 files changed, 12 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.h b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.h
index 460e00f..28d4b09 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.h
@@ -24,6 +24,7 @@
 #include "GraphicsLayer.h"
 #include "GraphicsLayerClient.h"
 #include "LayerContent.h"
+#include "PicturePile.h"
 #include "RefPtr.h"
 #include "ScrollableLayerAndroid.h"
 #include "SkBitmapRef.h"
@@ -40,12 +41,18 @@ class LayerAndroid;
 class FixedBackgroundImageLayerAndroid;
 class ScrollableLayerAndroid;
 
-class GraphicsLayerAndroid : public GraphicsLayer {
+class GraphicsLayerAndroid : public GraphicsLayer, PicturePainter {
 public:
 
     GraphicsLayerAndroid(GraphicsLayerClient*);
     virtual ~GraphicsLayerAndroid();
 
+    // PicturePainter
+
+    virtual void paintContents(GraphicsContext* gc, IntRect& dirty);
+
+    /////
+
     virtual void setName(const String&);
 
     // for hosting this GraphicsLayer in a native layer hierarchy
@@ -147,10 +154,7 @@ private:
     bool repaint();
     void needsNotifyClient();
 
-    SkPicture* paintPicture(const IntRect& rect);
-    bool paintContext(LayerAndroid* layer,
-                      const IntRect& rect,
-                      bool checkOptimisations = true);
+    bool paintContext(LayerAndroid* layer, PicturePile& picture);
 
     bool m_needsSyncChildren;
     bool m_needsSyncMask;
@@ -161,12 +165,13 @@ private:
     bool m_newImage;
     Image* m_image;
 
-    SkRegion m_dirtyRegion;
-
     LayerAndroid* m_contentLayer;
     FixedBackgroundImageLayerAndroid* m_fixedBackgroundLayer;
     LayerAndroid* m_foregroundLayer;
     LayerAndroid* m_foregroundClipLayer;
+
+    PicturePile m_contentLayerContent;
+    PicturePile m_foregroundLayerContent;
 };
 
 } // namespace WebCore