From 675402ef4358583f64a2476927a548db4841c856 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 12 Jul 2012 09:45:46 -0700 Subject: Use an R-Tree for operation recording Change-Id: I1380ae53139d5f50a25ea5edb61ec8b6818112ca --- Source/WebKit/android/jni/PicturePile.cpp | 6 +++--- Source/WebKit/android/jni/PicturePile.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/WebKit/android/jni') diff --git a/Source/WebKit/android/jni/PicturePile.cpp b/Source/WebKit/android/jni/PicturePile.cpp index 6a36ccf..0567b62 100644 --- a/Source/WebKit/android/jni/PicturePile.cpp +++ b/Source/WebKit/android/jni/PicturePile.cpp @@ -275,15 +275,15 @@ PrerenderedInval* PicturePile::prerenderedInvalForArea(const IntRect& area) #if USE_RECORDING_CONTEXT void PicturePile::drawPicture(SkCanvas* canvas, PictureContainer& pc) { - PlatformGraphicsContextSkia pgc(canvas); - pc.picture->apply(&pgc); + TRACE_METHOD(); + pc.picture->draw(canvas); } Picture* PicturePile::recordPicture(PicturePainter* painter, PictureContainer& pc) { // TODO: Support? Not needed? pc.prerendered.clear(); - GraphicsOperationCollection* picture = new GraphicsOperationCollection(); + Recording* picture = new Recording(); WebCore::PlatformGraphicsContextRecording pgc(picture); WebCore::GraphicsContext gc(&pgc); painter->paintContents(&gc, pc.area); diff --git a/Source/WebKit/android/jni/PicturePile.h b/Source/WebKit/android/jni/PicturePile.h index 64caa95..a8175d9 100644 --- a/Source/WebKit/android/jni/PicturePile.h +++ b/Source/WebKit/android/jni/PicturePile.h @@ -38,12 +38,12 @@ #include #include -#define USE_RECORDING_CONTEXT true +#define USE_RECORDING_CONTEXT false #if USE_RECORDING_CONTEXT namespace WebCore { -class GraphicsOperationCollection; +class Recording; } -typedef WebCore::GraphicsOperationCollection Picture; +typedef WebCore::Recording Picture; #else class SkPicture; typedef SkPicture Picture; -- cgit v1.1