diff options
| -rw-r--r-- | include/config/SkUserConfig.h | 7 | ||||
| -rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index ae5865ab37..430b4dd5fe 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -200,11 +200,4 @@ */ //#define SK_SUPPORT_GPU 1 -/* Defines the maximum size allowed for a given image to be rendered using the - deferred canvas. If the image is larger than this threshold, the image - is considered too large and the copy done by the deferred canvas too - expensive, so an image of that size would instead be drawn immediately. -*/ -//#define SK_DEFERRED_CANVAS_BITMAP_SIZE_THRESHOLD 1048576 - #endif diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index ffc935d5de..7ea3bbbe30 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -16,13 +16,10 @@ #include "SkPaint.h" #include "SkShader.h" -#ifndef SK_DEFERRED_CANVAS_BITMAP_SIZE_THRESHOLD -#define SK_DEFERRED_CANVAS_BITMAP_SIZE_THRESHOLD ~0 // Disables this feature -#endif - enum { // Deferred canvas will auto-flush when recording reaches this limit kDefaultMaxRecordingStorageBytes = 64*1024*1024, + kDeferredCanvasBitmapSizeThreshold = ~0, // Disables this feature }; enum PlaybackMode { @@ -327,7 +324,7 @@ DeferredDevice::DeferredDevice( , fRecordingCanvas(NULL) , fFreshFrame(true) , fPreviousStorageAllocated(0) - , fBitmapSizeThreshold(SK_DEFERRED_CANVAS_BITMAP_SIZE_THRESHOLD){ + , fBitmapSizeThreshold(kDeferredCanvasBitmapSizeThreshold){ fMaxRecordingStorageBytes = kDefaultMaxRecordingStorageBytes; fNotificationClient = notificationClient; |