| Index: cc/test/layer_tree_pixel_test.cc
|
| diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
|
| index fa2549ef0897b1d69c86e7d768af135deabca6eb..48a5dbbd556229eb54a99741f312a820caaed5a9 100644
|
| --- a/cc/test/layer_tree_pixel_test.cc
|
| +++ b/cc/test/layer_tree_pixel_test.cc
|
| @@ -4,6 +4,9 @@
|
|
|
| #include "cc/test/layer_tree_pixel_test.h"
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include "base/command_line.h"
|
| #include "base/path_service.h"
|
| #include "cc/base/switches.h"
|
| @@ -232,7 +235,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
|
| EXPECT_EQ(static_cast<unsigned>(GL_FRAMEBUFFER_COMPLETE),
|
| gl->CheckFramebufferStatus(GL_FRAMEBUFFER));
|
|
|
| - scoped_ptr<uint8[]> pixels(new uint8[size.GetArea() * 4]);
|
| + scoped_ptr<uint8_t[]> pixels(new uint8_t[size.GetArea() * 4]);
|
| gl->ReadPixels(0,
|
| 0,
|
| size.width(),
|
| @@ -247,7 +250,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
|
| scoped_ptr<SkBitmap> bitmap(new SkBitmap);
|
| bitmap->allocN32Pixels(size.width(), size.height());
|
|
|
| - uint8* out_pixels = static_cast<uint8*>(bitmap->getPixels());
|
| + uint8_t* out_pixels = static_cast<uint8_t*>(bitmap->getPixels());
|
|
|
| size_t row_bytes = size.width() * 4;
|
| size_t total_bytes = size.height() * row_bytes;
|
|
|