Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: sky/engine/platform/graphics/LoggingCanvas.cpp

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/platform/graphics/LoggingCanvas.h ('k') | sky/engine/platform/graphics/ProfilingCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « sky/engine/platform/graphics/LoggingCanvas.h ('k') | sky/engine/platform/graphics/ProfilingCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698