Skip to content

GitLab

T
tangled
Commit 2d2e1377 authored by Mike Reed's avatar Mike Reed Committed by Commit Bot
Browse files
Options

remove uncalled onBitmapDraw virtuals 

Change-Id: Ib0cdcc31d2daf89f79f3c620aee472c8d3f38d08
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2107722
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: default avatarFlorin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751227}
parent a1029b4f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 153 deletions
skia/ext/benchmarking_canvas.cc
View file @ 2d2e1377
......@@ -241,13 +241,6 @@ std::unique_ptr<base::Value> AsValue(const SkRegion& region) {
return std::move(val);
}
std::unique_ptr<base::Value> AsValue(const SkBitmap& bitmap) {
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue());
val->Set("size", AsValue(SkSize::Make(bitmap.width(), bitmap.height())));
return std::move(val);
}
std::unique_ptr<base::Value> AsValue(const SkImage& image) {
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue());
val->Set("size", AsValue(SkSize::Make(image.width(), image.height())));
......@@ -578,32 +571,6 @@ void BenchmarkingCanvas::onDrawPicture(const SkPicture* picture,
INHERITED::onDrawPicture(picture, matrix, op.paint());
}
void BenchmarkingCanvas::onDrawBitmap(const SkBitmap& bitmap,
SkScalar left,
SkScalar top,
const SkPaint* paint) {
AutoOp op(this, "DrawBitmap", paint);
op.addParam("bitmap", AsValue(bitmap));
op.addParam("left", AsValue(left));
op.addParam("top", AsValue(top));
INHERITED::onDrawBitmap(bitmap, left, top, op.paint());
}
void BenchmarkingCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
SrcRectConstraint constraint) {
AutoOp op(this, "DrawBitmapRect", paint);
op.addParam("bitmap", AsValue(bitmap));
if (src)
op.addParam("src", AsValue(*src));
op.addParam("dst", AsValue(dst));
INHERITED::onDrawBitmapRect(bitmap, src, dst, op.paint(), constraint);
}
void BenchmarkingCanvas::onDrawImage(const SkImage* image,
SkScalar left,
SkScalar top,
......
skia/ext/benchmarking_canvas.h
View file @ 2d2e1377
......@@ -54,9 +54,6 @@ protected:
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst,
const SkPaint*, SrcRectConstraint) override;
void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
const SkPaint*, SrcRectConstraint) override;
......
third_party/blink/renderer/platform/graphics/intercepting_canvas.h
View file @ 2d2e1377
......@@ -86,15 +86,6 @@ class InterceptingCanvasBase : public SkCanvas {
void onDrawOval(const SkRect&, const SkPaint&) override = 0;
void onDrawRRect(const SkRRect&, const SkPaint&) override = 0;
void onDrawPath(const SkPath&, const SkPaint&) override = 0;
void onDrawBitmap(const SkBitmap&,
SkScalar left,
SkScalar top,
const SkPaint*) override = 0;
void onDrawBitmapRect(const SkBitmap&,
const SkRect* src,
const SkRect& dst,
const SkPaint*,
SrcRectConstraint) override = 0;
void onDrawImage(const SkImage*,
SkScalar,
SkScalar,
......@@ -186,23 +177,6 @@ class InterceptingCanvas : public InterceptingCanvasBase {
this->SkCanvas::onDrawPath(path, paint);
}
void onDrawBitmap(const SkBitmap& bitmap,
SkScalar left,
SkScalar top,
const SkPaint* paint) override {
Interceptor interceptor(this);
this->SkCanvas::onDrawBitmap(bitmap, left, top, paint);
}
void onDrawBitmapRect(const SkBitmap& bitmap,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
SrcRectConstraint constraint) override {
Interceptor interceptor(this);
this->SkCanvas::onDrawBitmapRect(bitmap, src, dst, paint, constraint);
}
void onDrawImage(const SkImage* image,
SkScalar x,
SkScalar y,
......
third_party/blink/renderer/platform/graphics/logging_canvas.cc
View file @ 2d2e1377
......@@ -239,57 +239,6 @@ std::unique_ptr<JSONObject> ObjectForSkPath(const SkPath& path) {
return path_item;
}
String ColorTypeName(SkColorType color_type) {
switch (color_type) {
case kUnknown_SkColorType:
return "None";
case kAlpha_8_SkColorType:
return "A8";
case kRGB_565_SkColorType:
return "RGB565";
case kARGB_4444_SkColorType:
return "ARGB4444";
case kN32_SkColorType:
return "ARGB8888";
default:
NOTREACHED();
return "?";
};
}
std::unique_ptr<JSONObject> ObjectForBitmapData(const SkBitmap& bitmap) {
Vector<unsigned char> output;
SkPixmap src;
bool peekResult = bitmap.peekPixels(&src);
DCHECK(peekResult);
SkPngEncoder::Options options;
options.fFilterFlags = SkPngEncoder::FilterFlag::kSub;
options.fZLibLevel = 3;
if (!ImageEncoder::Encode(&output, src, options)) {
return nullptr;
}
auto data_item = std::make_unique<JSONObject>();
data_item->SetString("base64", Base64Encode(output));
data_item->SetString("mimeType", "image/png");
return data_item;
}
std::unique_ptr<JSONObject> ObjectForSkBitmap(const SkBitmap& bitmap) {
auto bitmap_item = std::make_unique<JSONObject>();
bitmap_item->SetInteger("width", bitmap.width());
bitmap_item->SetInteger("height", bitmap.height());
bitmap_item->SetString("config", ColorTypeName(bitmap.colorType()));
bitmap_item->SetBoolean("opaque", bitmap.isOpaque());
bitmap_item->SetBoolean("immutable", bitmap.isImmutable());
bitmap_item->SetBoolean("volatile", bitmap.isVolatile());
bitmap_item->SetInteger("genID", bitmap.getGenerationID());
bitmap_item->SetObject("data", ObjectForBitmapData(bitmap));
return bitmap_item;
}
std::unique_ptr<JSONObject> ObjectForSkImage(const SkImage* image) {
auto image_item = std::make_unique<JSONObject>();
image_item->SetInteger("width", image->width());
......@@ -519,37 +468,6 @@ void LoggingCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
this->SkCanvas::onDrawPath(path, paint);
}
void LoggingCanvas::onDrawBitmap(const SkBitmap& bitmap,
SkScalar left,
SkScalar top,
const SkPaint* paint) {
AutoLogger logger(this);
JSONObject* params = logger.LogItemWithParams("drawBitmap");
params->SetDouble("left", left);
params->SetDouble("top", top);
params->SetObject("bitmap", ObjectForSkBitmap(bitmap));
if (paint)
params->SetObject("paint", ObjectForSkPaint(*paint));
this->SkCanvas::onDrawBitmap(bitmap, left, top, paint);
}
void LoggingCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
SrcRectConstraint constraint) {
AutoLogger logger(this);
JSONObject* params = logger.LogItemWithParams("drawBitmapRectToRect");
params->SetObject("bitmap", ObjectForSkBitmap(bitmap));
if (src)
params->SetObject("src", ObjectForSkRect(*src));
params->SetObject("dst", ObjectForSkRect(dst));
if (paint)
params->SetObject("paint", ObjectForSkPaint(*paint));
params->SetInteger("flags", constraint);
this->SkCanvas::onDrawBitmapRect(bitmap, src, dst, paint, constraint);
}
void LoggingCanvas::onDrawImage(const SkImage* image,
SkScalar left,
SkScalar top,
......
third_party/blink/renderer/platform/graphics/logging_canvas.h
View file @ 2d2e1377
......@@ -53,15 +53,6 @@ class LoggingCanvas : public InterceptingCanvasBase {
void onDrawOval(const SkRect&, const SkPaint&) override;
void onDrawRRect(const SkRRect&, const SkPaint&) override;
void onDrawPath(const SkPath&, const SkPaint&) override;
void onDrawBitmap(const SkBitmap&,
SkScalar left,
SkScalar top,
const SkPaint*) override;
void onDrawBitmapRect(const SkBitmap&,
const SkRect* src,
const SkRect& dst,
const SkPaint*,
SrcRectConstraint) override;
void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
void onDrawImageRect(const SkImage*,
const SkRect* src,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment