| Index: sky/engine/platform/graphics/LoggingCanvas.cpp
|
| diff --git a/sky/engine/platform/graphics/LoggingCanvas.cpp b/sky/engine/platform/graphics/LoggingCanvas.cpp
|
| index 18adab937c1a9732b9ba07a8cdea5ee51be9e9ad..8cb941fe45fd654eb3f7bce035545c95bec9924f 100644
|
| --- a/sky/engine/platform/graphics/LoggingCanvas.cpp
|
| +++ b/sky/engine/platform/graphics/LoggingCanvas.cpp
|
| @@ -160,16 +160,6 @@ void LoggingCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* s
|
| this->SkCanvas::drawBitmapRectToRect(bitmap, src, dst, paint, flags);
|
| }
|
|
|
| -void LoggingCanvas::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, const SkPaint* paint)
|
| -{
|
| - AutoLogger logger(this);
|
| - RefPtr<JSONObject> params = logger.logItemWithParams("drawBitmapMatrix");
|
| - params->setObject("bitmap", objectForSkBitmap(bitmap));
|
| - params->setArray("matrix", arrayForSkMatrix(m));
|
| - params->setObject("paint", objectForSkPaint(*paint));
|
| - this->SkCanvas::drawBitmapMatrix(bitmap, m, paint);
|
| -}
|
| -
|
| void LoggingCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, const SkPaint* paint)
|
| {
|
| AutoLogger logger(this);
|
| @@ -288,21 +278,6 @@ void LoggingCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const
|
| this->SkCanvas::onDrawTextOnPath(text, byteLength, path, matrix, paint);
|
| }
|
|
|
| -void LoggingCanvas::onPushCull(const SkRect& cullRect)
|
| -{
|
| - AutoLogger logger(this);
|
| - RefPtr<JSONObject> params = logger.logItemWithParams("pushCull");
|
| - params->setObject("cullRect", objectForSkRect(cullRect));
|
| - this->SkCanvas::onPushCull(cullRect);
|
| -}
|
| -
|
| -void LoggingCanvas::onPopCull()
|
| -{
|
| - AutoLogger logger(this);
|
| - logger.logItem("popCull");
|
| - this->SkCanvas::onPopCull();
|
| -}
|
| -
|
| void LoggingCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle style)
|
| {
|
| AutoLogger logger(this);
|
| @@ -461,9 +436,10 @@ PassRefPtr<JSONArray> LoggingCanvas::arrayForSkPoints(size_t count, const SkPoin
|
|
|
| PassRefPtr<JSONObject> LoggingCanvas::objectForSkPicture(const SkPicture& picture)
|
| {
|
| + const SkIRect bounds = picture.cullRect().roundOut();
|
| RefPtr<JSONObject> pictureItem = JSONObject::create();
|
| - pictureItem->setNumber("width", picture.width());
|
| - pictureItem->setNumber("height", picture.height());
|
| + pictureItem->setNumber("width", bounds.width());
|
| + pictureItem->setNumber("height", bounds.height());
|
| return pictureItem.release();
|
| }
|
|
|
|
|