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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/canvas.cc

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 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 | « ui/gfx/canvas.h ('k') | ui/gfx/canvas_paint_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/canvas.cc
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 5dd577419e9fa90eb1da9236db7af01300eb2cd2..4c40530b98a9de7978c064529617dc6f6e7548b2 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -9,6 +9,9 @@
#include "base/i18n/rtl.h"
#include "base/logging.h"
+#include "skia/ext/cdl_canvas.h"
+#include "skia/ext/cdl_paint.h"
+#include "skia/ext/cdl_shader.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkRefCnt.h"
@@ -49,7 +52,7 @@ Canvas::Canvas()
canvas_owner_(skia::CreatePlatformCanvas(0, 0, false)),
canvas_(canvas_owner_.get()) {}
-Canvas::Canvas(SkCanvas* canvas, float image_scale)
+Canvas::Canvas(CdlCanvas* canvas, float image_scale)
: image_scale_(image_scale), canvas_(canvas) {
DCHECK(canvas_);
}
@@ -152,9 +155,9 @@ void Canvas::DrawDashedRect(const RectF& rect, SkColor color) {
}
// Make a shader for the bitmap with an origin of the box we'll draw.
- SkPaint paint;
- paint.setShader(SkShader::MakeBitmapShader(*dots, SkShader::kRepeat_TileMode,
- SkShader::kRepeat_TileMode));
+ CdlPaint paint;
+ paint.setShader(WrapSkShader(SkShader::MakeBitmapShader(
+ *dots, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode)));
DrawRect(RectF(rect.x(), rect.y(), rect.width(), 1), paint);
DrawRect(RectF(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1),
@@ -234,9 +237,9 @@ void Canvas::FillRect(const Rect& rect, SkColor color) {
}
void Canvas::FillRect(const Rect& rect, SkColor color, SkBlendMode mode) {
- SkPaint paint;
+ CdlPaint paint;
paint.setColor(color);
- paint.setStyle(SkPaint::kFill_Style);
+ paint.setStyle(CdlPaint::kFill_Style);
paint.setBlendMode(mode);
DrawRect(rect, paint);
}
@@ -254,9 +257,9 @@ void Canvas::DrawRect(const Rect& rect, SkColor color, SkBlendMode mode) {
}
void Canvas::DrawRect(const RectF& rect, SkColor color, SkBlendMode mode) {
- SkPaint paint;
+ CdlPaint paint;
paint.setColor(color);
- paint.setStyle(SkPaint::kStroke_Style);
+ paint.setStyle(CdlPaint::kStroke_Style);
// Set a stroke width of 0, which will put us down the stroke rect path. If
// we set a stroke width of 1, for example, this will internally create a
// path and fill it, which causes problems near the edge of the canvas.
@@ -266,19 +269,19 @@ void Canvas::DrawRect(const RectF& rect, SkColor color, SkBlendMode mode) {
DrawRect(rect, paint);
}
-void Canvas::DrawRect(const Rect& rect, const SkPaint& paint) {
+void Canvas::DrawRect(const Rect& rect, const CdlPaint& paint) {
DrawRect(RectF(rect), paint);
}
-void Canvas::DrawRect(const RectF& rect, const SkPaint& paint) {
+void Canvas::DrawRect(const RectF& rect, const CdlPaint& paint) {
canvas_->drawRect(RectFToSkRect(rect), paint);
}
-void Canvas::DrawPoint(const Point& p1, const SkPaint& paint) {
+void Canvas::DrawPoint(const Point& p1, const CdlPaint& paint) {
DrawPoint(PointF(p1), paint);
}
-void Canvas::DrawPoint(const PointF& p1, const SkPaint& paint) {
+void Canvas::DrawPoint(const PointF& p1, const CdlPaint& paint) {
canvas_->drawPoint(SkFloatToScalar(p1.x()), SkFloatToScalar(p1.y()), paint);
}
@@ -287,32 +290,32 @@ void Canvas::DrawLine(const Point& p1, const Point& p2, SkColor color) {
}
void Canvas::DrawLine(const PointF& p1, const PointF& p2, SkColor color) {
- SkPaint paint;
+ CdlPaint paint;
paint.setColor(color);
paint.setStrokeWidth(SkIntToScalar(1));
DrawLine(p1, p2, paint);
}
-void Canvas::DrawLine(const Point& p1, const Point& p2, const SkPaint& paint) {
+void Canvas::DrawLine(const Point& p1, const Point& p2, const CdlPaint& paint) {
DrawLine(PointF(p1), PointF(p2), paint);
}
void Canvas::DrawLine(const PointF& p1,
const PointF& p2,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
canvas_->drawLine(SkFloatToScalar(p1.x()), SkFloatToScalar(p1.y()),
SkFloatToScalar(p2.x()), SkFloatToScalar(p2.y()), paint);
}
void Canvas::DrawCircle(const Point& center_point,
int radius,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
DrawCircle(PointF(center_point), radius, paint);
}
void Canvas::DrawCircle(const PointF& center_point,
float radius,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
canvas_->drawCircle(SkFloatToScalar(center_point.x()),
SkFloatToScalar(center_point.y()),
SkFloatToScalar(radius), paint);
@@ -320,18 +323,18 @@ void Canvas::DrawCircle(const PointF& center_point,
void Canvas::DrawRoundRect(const Rect& rect,
int radius,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
DrawRoundRect(RectF(rect), radius, paint);
}
void Canvas::DrawRoundRect(const RectF& rect,
float radius,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
canvas_->drawRoundRect(RectFToSkRect(rect), SkFloatToScalar(radius),
SkFloatToScalar(radius), paint);
}
-void Canvas::DrawPath(const SkPath& path, const SkPaint& paint) {
+void Canvas::DrawPath(const SkPath& path, const CdlPaint& paint) {
canvas_->drawPath(path, paint);
}
@@ -346,22 +349,22 @@ void Canvas::DrawFocusRect(const RectF& rect) {
void Canvas::DrawSolidFocusRect(const RectF& rect,
SkColor color,
float thickness) {
- SkPaint paint;
+ CdlPaint paint;
paint.setColor(color);
paint.setStrokeWidth(SkFloatToScalar(thickness));
- paint.setStyle(SkPaint::kStroke_Style);
+ paint.setStyle(CdlPaint::kStroke_Style);
gfx::RectF draw_rect = rect;
draw_rect.Inset(gfx::InsetsF(thickness / 2));
DrawRect(draw_rect, paint);
}
void Canvas::DrawImageInt(const ImageSkia& image, int x, int y) {
- SkPaint paint;
+ CdlPaint paint;
DrawImageInt(image, x, y, paint);
}
void Canvas::DrawImageInt(const ImageSkia& image, int x, int y, uint8_t a) {
- SkPaint paint;
+ CdlPaint paint;
paint.setAlpha(a);
DrawImageInt(image, x, y, paint);
}
@@ -369,7 +372,7 @@ void Canvas::DrawImageInt(const ImageSkia& image, int x, int y, uint8_t a) {
void Canvas::DrawImageInt(const ImageSkia& image,
int x,
int y,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
if (image_rep.is_null())
return;
@@ -395,7 +398,7 @@ void Canvas::DrawImageInt(const ImageSkia& image,
int dest_w,
int dest_h,
bool filter) {
- SkPaint p;
+ CdlPaint p;
DrawImageInt(image, src_x, src_y, src_w, src_h, dest_x, dest_y,
dest_w, dest_h, filter, p);
}
@@ -410,7 +413,7 @@ void Canvas::DrawImageInt(const ImageSkia& image,
int dest_w,
int dest_h,
bool filter,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
if (image_rep.is_null())
return;
@@ -425,7 +428,7 @@ void Canvas::DrawImageIntInPixel(const ImageSkiaRep& image_rep,
int dest_w,
int dest_h,
bool filter,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
int src_x = 0;
int src_y = 0;
int src_w = image_rep.pixel_width();
@@ -441,17 +444,16 @@ void Canvas::DrawImageInPath(const ImageSkia& image,
int x,
int y,
const SkPath& path,
- const SkPaint& paint) {
+ const CdlPaint& paint) {
const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
if (image_rep.is_null())
return;
SkMatrix matrix;
matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y));
- SkPaint p(paint);
- p.setShader(CreateImageRepShader(image_rep,
- SkShader::kRepeat_TileMode,
- matrix));
+ CdlPaint p(paint);
+ p.setShader(WrapSkShader(
+ CreateImageRepShader(image_rep, SkShader::kRepeat_TileMode, matrix)));
canvas_->drawPath(path, p);
}
@@ -506,7 +508,7 @@ void Canvas::TileImageInt(const ImageSkia& image,
if (!IntersectsClipRect(dest_rect))
return;
- SkPaint paint;
+ CdlPaint paint;
if (InitSkPaintForTiling(image, src_x, src_y, tile_scale_x, tile_scale_y,
dest_x, dest_y, &paint))
canvas_->drawRect(dest_rect, paint);
@@ -519,7 +521,7 @@ bool Canvas::InitSkPaintForTiling(const ImageSkia& image,
float tile_scale_y,
int dest_x,
int dest_y,
- SkPaint* paint) {
+ CdlPaint* paint) {
const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
if (image_rep.is_null())
return false;
@@ -530,8 +532,8 @@ bool Canvas::InitSkPaintForTiling(const ImageSkia& image,
shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
- paint->setShader(CreateImageRepShader(image_rep, SkShader::kRepeat_TileMode,
- shader_scale));
+ paint->setShader(WrapSkShader(CreateImageRepShader(
+ image_rep, SkShader::kRepeat_TileMode, shader_scale)));
paint->setBlendMode(SkBlendMode::kSrcOver);
return true;
}
@@ -555,7 +557,7 @@ void Canvas::DrawImageIntHelper(const ImageSkiaRep& image_rep,
int dest_w,
int dest_h,
bool filter,
- const SkPaint& paint,
+ const CdlPaint& paint,
bool remove_image_scale) {
DLOG_ASSERT(src_x + src_w < std::numeric_limits<int16_t>::max() &&
src_y + src_h < std::numeric_limits<int16_t>::max());
@@ -584,11 +586,11 @@ void Canvas::DrawImageIntHelper(const ImageSkiaRep& image_rep,
shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
- SkPaint p(paint);
+ CdlPaint p(paint);
p.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
- p.setShader(CreateImageRepShaderForScale(
+ p.setShader(WrapSkShader(CreateImageRepShaderForScale(
image_rep, SkShader::kRepeat_TileMode, shader_scale,
- remove_image_scale ? image_rep.scale() : 1.f));
+ remove_image_scale ? image_rep.scale() : 1.f)));
// The rect will be filled by the bitmap.
canvas_->drawRect(dest_rect, p);
« no previous file with comments | « ui/gfx/canvas.h ('k') | ui/gfx/canvas_paint_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698