| Index: ui/gfx/compositor/layer_unittest.cc
|
| diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc
|
| index 7445256c199f3696227ee0e16b7e31ed0e055ada..97bc387bddd1a49d63f701a4025db540184da11a 100644
|
| --- a/ui/gfx/compositor/layer_unittest.cc
|
| +++ b/ui/gfx/compositor/layer_unittest.cc
|
| @@ -4,9 +4,14 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/file_path.h"
|
| +#include "base/file_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/path_service.h"
|
| +#include "base/string_util.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/canvas_skia.h"
|
| +#include "ui/gfx/codec/png_codec.h"
|
| #include "ui/gfx/compositor/compositor_observer.h"
|
| #include "ui/gfx/compositor/layer.h"
|
| #include "ui/gfx/compositor/layer_animation_sequence.h"
|
| @@ -173,6 +178,20 @@ class NullLayerDelegate : public LayerDelegate {
|
| DISALLOW_COPY_AND_ASSIGN(NullLayerDelegate);
|
| };
|
|
|
| +// Encodes a bitmap into a PNG and write to disk. Returns true on success. The
|
| +// parent directory does not have to exist.
|
| +bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path) {
|
| + std::vector<unsigned char> png_data;
|
| + if (gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &png_data) &&
|
| + file_util::CreateDirectory(file_path.DirName())) {
|
| + int bytes_written = file_util::WriteFile(
|
| + file_path, reinterpret_cast<char*>(&png_data[0]), png_data.size());
|
| + if (bytes_written == static_cast<int>(png_data.size()))
|
| + return true;
|
| + }
|
| + return false;
|
| +}
|
| +
|
| }
|
|
|
| #if defined(OS_WIN)
|
| @@ -792,7 +811,7 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_DrawPixels) {
|
| DrawTree(layer.get());
|
|
|
| SkBitmap bitmap;
|
| - GetCompositor()->ReadPixels(&bitmap);
|
| + ASSERT_TRUE(GetCompositor()->ReadPixels(&bitmap));
|
| ASSERT_FALSE(bitmap.empty());
|
|
|
| SkAutoLockPixels lock(bitmap);
|
|
|