| Index: ui/gfx/canvas.h
|
| diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
|
| index d154962e7b5521b12a2c37c321a2bd3235084f9d..d1d031ce3abbe368e6d69677f3d5dd1bfd4ad641 100644
|
| --- a/ui/gfx/canvas.h
|
| +++ b/ui/gfx/canvas.h
|
| @@ -5,9 +5,11 @@
|
| #ifndef UI_GFX_CANVAS_H_
|
| #define UI_GFX_CANVAS_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "skia/ext/platform_canvas.h"
|
| @@ -179,8 +181,8 @@ class GFX_EXPORT Canvas {
|
| // at the specified alpha once Restore() is called.
|
| // |layer_bounds| are the bounds of the layer relative to the current
|
| // transform.
|
| - void SaveLayerAlpha(uint8 alpha);
|
| - void SaveLayerAlpha(uint8 alpha, const Rect& layer_bounds);
|
| + void SaveLayerAlpha(uint8_t alpha);
|
| + void SaveLayerAlpha(uint8_t alpha, const Rect& layer_bounds);
|
|
|
| // Restores the drawing state after a call to Save*(). It is an error to
|
| // call Restore() more times than Save*().
|
| @@ -268,7 +270,7 @@ class GFX_EXPORT Canvas {
|
|
|
| // Helper for DrawImageInt(..., paint) that constructs a temporary paint and
|
| // calls paint.setAlpha(alpha).
|
| - void DrawImageInt(const ImageSkia&, int x, int y, uint8 alpha);
|
| + void DrawImageInt(const ImageSkia&, int x, int y, uint8_t alpha);
|
|
|
| // Draws an image with the origin at the specified location, using the
|
| // specified paint. The upper left corner of the bitmap is rendered at the
|
|
|