Make reftests work for sky.

sky/compositor/layer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/compositor/layer.h"
 
 #include "base/debug/trace_event.h"
 #include "mojo/skia/ganesh_surface.h"
 #include "sky/compositor/layer_host.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/gfx/codec/png_codec.h"
 
 namespace sky {
 
-Layer::Layer(LayerClient* client) : client_(client), host_(nullptr) {
+Layer::Layer(LayerClient* client, bool is_testing)
+  : client_(client),
+    host_(nullptr),
+    is_testing_(is_testing) {
 }
 
 Layer::~Layer() {
 }
 
 void Layer::ClearClient() {
   client_ = nullptr;
 }
 
 void Layer::SetSize(const gfx::Size& size) {
   size_ = size;
 }
 
+std::string Layer::GetPixelsForTesting() {

[esprehn, 2014/12/11 23:18:59]

Returning a string is weird, I'd return either a vector<> or a special type. A
special type makes more sense since you're making copies of a massive string as
you pass this thing around. I think you want to return scoped_ptr (or OwnPtr)?

[ojan, 2014/12/13 00:18:33]

I made it a std::vector<unsigned char> that you pass in as an out-param to avoid
excessive copies.

+  DCHECK(is_testing_);
+
+  std::vector<unsigned char> png_data;
+  bool encoding_succeeded = gfx::PNGCodec::EncodeBGRASkBitmap(bitmap_, false, &png_data);
+  if (encoding_succeeded)
+    return std::string(reinterpret_cast<const char*>(&png_data[0]), png_data.size());
+  return std::string();
+}
+
 void Layer::Display() {
   TRACE_EVENT0("sky", "Layer::Display");
 
   DCHECK(host_);
 
   mojo::GaneshSurface surface(host_->ganesh_context(),
                               host_->resource_manager()->CreateTexture(size_));
 
   SkCanvas* canvas = surface.canvas();
 
-  gfx::Rect rect(size_);
-  client_->PaintContents(canvas, rect);
-  canvas->flush();
+  if (is_testing_) {

[esprehn, 2014/12/11 23:18:59]

Instead I think you want a LayerDelegate interface that has a method on it.
Testing would pass the TestingLayerDelegate, otherwise we pass the
DisplayLayerDelegate.

[ojan, 2014/12/13 00:18:33]

Done.

+    bitmap_.reset();
+    bitmap_.allocN32Pixels(size_.width(), size_.height());
+    SkBitmapDevice device(bitmap_);
+    SkCanvas bitmapCanvas(&device);
+
+    gfx::Rect bitmapRect(size_);
+    bitmapCanvas.drawColor(SK_ColorRED);
+    client_->PaintContents(&bitmapCanvas, bitmapRect);
+    bitmapCanvas.flush();
+  } else {
+    gfx::Rect rect(size_);
+    client_->PaintContents(canvas, rect);
+    canvas->flush();
+  }
 
   texture_ = surface.TakeTexture();
 }
 
 scoped_ptr<mojo::GLTexture> Layer::GetTexture() {
   return texture_.Pass();
 }
 
 }  // namespace sky