use picture recording flag to speed up clipPath (and avoid asserts in very large edgelists)

override (and no-op) clipPath() in IsEmptyCanvas, same reasons as above.

Change-Id: I70b1565a11c1e314fdde507c1b2118b9aba651e6

2 files changed, 8 insertions, 2 deletions

diff --git a/WebKit/android/jni/PictureSet.cpp b/WebKit/android/jni/PictureSet.cpp
index 22f57a3..55d36b4 100644
--- a/WebKit/android/jni/PictureSet.cpp
+++ b/WebKit/android/jni/PictureSet.cpp
@@ -355,7 +355,13 @@ public:
         mEmpty = false;
         mPicture->abortPlayback();    
     }
-    
+
+    virtual bool clipPath(const SkPath&, SkRegion::Op) {
+        // this can be expensive to actually do, and doesn't affect the
+        // question of emptiness, so we make it a no-op
+        return true;
+    }
+
     virtual void commonDrawBitmap(const SkBitmap& bitmap,
             const SkMatrix& , const SkPaint& ) {
         if (bitmap.width() <= 1 || bitmap.height() <= 1)
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 529f1d6..a0e4642 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -787,7 +787,7 @@ SkPicture* WebViewCore::rebuildPicture(const SkIRect& inval)
     int width = view->contentsWidth();
     int height = view->contentsHeight();
     SkPicture* picture = new SkPicture();
-    SkAutoPictureRecord arp(picture, width, height);
+    SkAutoPictureRecord arp(picture, width, height, PICT_RECORD_FLAGS);
     SkAutoMemoryUsageProbe mup(__FUNCTION__);
     SkCanvas* recordingCanvas = arp.getRecordingCanvas();