1 files changed, 21 insertions, 15 deletions

diff --git a/Source/WebKit/android/jni/PicturePile.h b/Source/WebKit/android/jni/PicturePile.h
index b28a792..6e3e46d 100644
--- a/Source/WebKit/android/jni/PicturePile.h
+++ b/Source/WebKit/android/jni/PicturePile.h
@@ -38,7 +38,17 @@
 #include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/Vector.h>
 
+#define USE_RECORDING_CONTEXT true
+#if USE_RECORDING_CONTEXT
+namespace WebCore {
+class Recording;
+}
+typedef WebCore::Recording Picture;
+#else
 class SkPicture;
+typedef SkPicture Picture;
+#endif
+
 class SkCanvas;
 
 namespace WebCore {
@@ -57,37 +67,27 @@ public:
 
 class PictureContainer {
 public:
-    SkPicture* picture;
+    Picture* picture;
     IntRect area;
     bool dirty;
     RefPtr<PrerenderedInval> prerendered;
+    bool hasText;
 
     PictureContainer(const IntRect& area)
         : picture(0)
         , area(area)
         , dirty(true)
+        , hasText(false)
     {}
 
-    PictureContainer(const PictureContainer& other)
-        : picture(other.picture)
-        , area(other.area)
-        , dirty(other.dirty)
-        , prerendered(other.prerendered)
-    {
-        SkSafeRef(picture);
-    }
-
-    ~PictureContainer()
-    {
-        SkSafeUnref(picture);
-    }
+    PictureContainer(const PictureContainer& other);
+    ~PictureContainer();
 };
 
 class PicturePile {
 public:
     PicturePile() {}
     PicturePile(const PicturePile& other);
-    PicturePile(SkPicture* picture);
 
     const IntSize& size() { return m_size; }
 
@@ -104,11 +104,17 @@ public:
     SkRegion& dirtyRegion() { return m_dirtyRegion; }
     PrerenderedInval* prerenderedInvalForArea(const IntRect& area);
 
+    // UI-side methods used to check content, after construction/updates are complete
+    bool hasText() const;
+    bool isEmpty() const;
+
 private:
     void applyWebkitInvals();
     void updatePicture(PicturePainter* painter, PictureContainer& container);
+    Picture* recordPicture(PicturePainter* painter, PictureContainer& container);
     void appendToPile(const IntRect& inval, const IntRect& originalInval = IntRect());
     void drawWithClipRecursive(SkCanvas* canvas, SkRegion& clipRegion, int index);
+    void drawPicture(SkCanvas* canvas, PictureContainer& pc);
 
     IntSize m_size;
     Vector<PictureContainer> m_pile;