diff options
Diffstat (limited to 'Source/WebKit/android/jni/PictureSet.h')
| -rw-r--r-- | Source/WebKit/android/jni/PictureSet.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Source/WebKit/android/jni/PictureSet.h b/Source/WebKit/android/jni/PictureSet.h index fe47361..1d9a14d 100644 --- a/Source/WebKit/android/jni/PictureSet.h +++ b/Source/WebKit/android/jni/PictureSet.h @@ -31,9 +31,9 @@ #define PICTURE_SET_VALIDATE 0 #if PICTURE_SET_DEBUG -#define DBG_SET_LOG(message) LOGD("%s %s", __FUNCTION__, message) -#define DBG_SET_LOGD(format, ...) LOGD("%s " format, __FUNCTION__, __VA_ARGS__) -#define DEBUG_SET_UI_LOGD(...) LOGD(__VA_ARGS__) +#define DBG_SET_LOG(message) ALOGD("%s %s", __FUNCTION__, message) +#define DBG_SET_LOGD(format, ...) ALOGD("%s " format, __FUNCTION__, __VA_ARGS__) +#define DEBUG_SET_UI_LOGD(...) ALOGD(__VA_ARGS__) #else #define DBG_SET_LOG(message) ((void)0) #define DBG_SET_LOGD(format, ...) ((void)0) @@ -83,8 +83,7 @@ namespace android { void splitAdd(const SkIRect& rect); #endif - void add(const SkRegion& area, SkPicture* picture, - uint32_t elapsed, bool split); + void add(const SkRegion& area, uint32_t elapsed, bool split); // Update mWidth/mHeight, and adds any additional inval region void setDimensions(int width, int height, SkRegion* inval = 0); @@ -97,11 +96,9 @@ namespace android { #ifdef FAST_PICTURESET #else - void add(const SkRegion& area, SkPicture* picture, - uint32_t elapsed, bool split, bool empty); + void add(const SkIRect& area, uint32_t elapsed, bool split, bool empty); const SkIRect& bounds(size_t i) const { - return mPictures[i].mArea.getBounds(); } - bool reuseSubdivided(const SkRegion& ); + return mPictures[i].mArea; } void setPicture(size_t i, SkPicture* p); void setDrawTimes(const PictureSet& ); size_t size() const { return mPictures.size(); } @@ -123,7 +120,7 @@ namespace android { int mBucketCountY; #else struct Pictures { - SkRegion mArea; + SkIRect mArea; SkPicture* mPicture; SkIRect mUnsplit; uint32_t mElapsed; |