diff options
| -rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/PictureSet.cpp | 8 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index b50148f..ea510f8 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -996,8 +996,10 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c // The root layer always has a compositing layer, but it may not have backing. return (inCompositingMode() && layer->isRootLayer()) || requiresCompositingForTransform(renderer) || +#if PLATFORM(ANDROID) #if ENABLE(COMPOSITED_FIXED_ELEMENTS) layer->isFixed() || +#endif #else requiresCompositingForVideo(renderer) || requiresCompositingForCanvas(renderer) || 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(); |