| Index: ui/gfx/paint_vector_icon.h
|
| diff --git a/ui/gfx/paint_vector_icon.h b/ui/gfx/paint_vector_icon.h
|
| index 5dbf66cfff5c234812737b24ef27c300c01b5aae..2c7710e1502562771ecffe5cb03250d53123517e 100644
|
| --- a/ui/gfx/paint_vector_icon.h
|
| +++ b/ui/gfx/paint_vector_icon.h
|
| @@ -14,6 +14,7 @@
|
| namespace gfx {
|
|
|
| class Canvas;
|
| +struct VectorIcon;
|
| enum class VectorIconId;
|
|
|
| // Draws a vector icon identified by |id| onto |canvas| at (0, 0). |dip_size|
|
| @@ -23,16 +24,24 @@ GFX_EXPORT void PaintVectorIcon(Canvas* canvas,
|
| VectorIconId id,
|
| size_t dip_size,
|
| SkColor color);
|
| +GFX_EXPORT void PaintVectorIcon(Canvas* canvas,
|
| + const VectorIcon* icon,
|
| + size_t dip_size,
|
| + SkColor color);
|
|
|
| // Creates an ImageSkia which will render the icon on demand. The size will come
|
| // from the .icon file (the 1x version, if multiple versions exist).
|
| GFX_EXPORT ImageSkia CreateVectorIcon(VectorIconId id,
|
| SkColor color);
|
| +GFX_EXPORT ImageSkia CreateVectorIcon(const VectorIcon* icon, SkColor color);
|
|
|
| // As above, but creates the image at the given size.
|
| GFX_EXPORT ImageSkia CreateVectorIcon(VectorIconId id,
|
| size_t dip_size,
|
| SkColor color);
|
| +GFX_EXPORT ImageSkia CreateVectorIcon(const VectorIcon* icon,
|
| + size_t dip_size,
|
| + SkColor color);
|
|
|
| // As above, but also paints a badge defined by |badge_id| on top of the icon.
|
| // The badge uses the same canvas size and default color as the icon.
|
| @@ -40,6 +49,10 @@ GFX_EXPORT ImageSkia CreateVectorIconWithBadge(VectorIconId id,
|
| size_t dip_size,
|
| SkColor color,
|
| VectorIconId badge_id);
|
| +GFX_EXPORT ImageSkia CreateVectorIconWithBadge(const VectorIcon* icon,
|
| + size_t dip_size,
|
| + SkColor color,
|
| + const VectorIcon* badge_icon);
|
|
|
| #if defined(GFX_VECTOR_ICONS_UNSAFE) || defined(GFX_IMPLEMENTATION)
|
| // Takes a string of the format expected of .icon files and renders onto
|
|
|