From faee292fa2cb97c8fa8ee541e08cd21318cf9e63 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Mon, 21 Sep 2015 16:31:26 -0700 Subject: [PATCH] Delete "services/sky/compositor/picture_serializer" --- services/sky/compositor/BUILD.gn | 2 -- services/sky/compositor/picture_serializer.cc | 36 ------------------- services/sky/compositor/picture_serializer.h | 16 --------- services/sky/compositor/texture_layer.cc | 7 ---- 4 files changed, 61 deletions(-) delete mode 100644 services/sky/compositor/picture_serializer.cc delete mode 100644 services/sky/compositor/picture_serializer.h diff --git a/services/sky/compositor/BUILD.gn b/services/sky/compositor/BUILD.gn index 7bba85662..ead14b1f2 100644 --- a/services/sky/compositor/BUILD.gn +++ b/services/sky/compositor/BUILD.gn @@ -10,8 +10,6 @@ source_set("compositor") { "layer_host.h", "layer_host_client.cc", "layer_host_client.h", - "picture_serializer.cc", - "picture_serializer.h", "rasterizer.cc", "rasterizer.h", "rasterizer_bitmap.cc", diff --git a/services/sky/compositor/picture_serializer.cc b/services/sky/compositor/picture_serializer.cc deleted file mode 100644 index cb58067dd..000000000 --- a/services/sky/compositor/picture_serializer.cc +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2015 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 "services/sky/compositor/picture_serializer.h" - -#include "third_party/skia/include/core/SkData.h" -#include "third_party/skia/include/core/SkPixelSerializer.h" -#include "third_party/skia/include/core/SkStream.h" -#include "ui/gfx/codec/png_codec.h" - -namespace sky { - -class PngPixelSerializer : public SkPixelSerializer { - public: - bool onUseEncodedData(const void*, size_t) override { return true; } - SkData* onEncodePixels(const SkImageInfo& info, const void* pixels, - size_t row_bytes) override { - std::vector data; - - SkBitmap bm; - if (!bm.installPixels(info, const_cast(pixels), row_bytes)) - return nullptr; - if (!gfx::PNGCodec::EncodeBGRASkBitmap(bm, false, &data)) - return nullptr; - return SkData::NewWithCopy(&data.front(), data.size()); - } -}; - -void SerializePicture(const char* file_name, SkPicture* picture) { - SkFILEWStream stream(file_name); - PngPixelSerializer serializer; - picture->serialize(&stream, &serializer); -} - -} // namespace sky diff --git a/services/sky/compositor/picture_serializer.h b/services/sky/compositor/picture_serializer.h deleted file mode 100644 index dfddb2b28..000000000 --- a/services/sky/compositor/picture_serializer.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2015 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. - -#ifndef SKY_VIEWER_COMPOSITOR_PICTURE_SERIALIZER_H_ -#define SKY_VIEWER_COMPOSITOR_PICTURE_SERIALIZER_H_ - -#include "third_party/skia/include/core/SkPicture.h" - -namespace sky { - -void SerializePicture(const char* file_name, SkPicture*); - -} // namespace sky - -#endif // SKY_VIEWER_COMPOSITOR_PICTURE_SERIALIZER_H_ diff --git a/services/sky/compositor/texture_layer.cc b/services/sky/compositor/texture_layer.cc index ead0c3d0a..fc1d5f885 100644 --- a/services/sky/compositor/texture_layer.cc +++ b/services/sky/compositor/texture_layer.cc @@ -6,7 +6,6 @@ #include "base/trace_event/trace_event.h" #include "services/sky/compositor/layer_host.h" -#include "services/sky/compositor/picture_serializer.h" #include "services/sky/compositor/rasterizer.h" #include "sky/engine/wtf/RefPtr.h" #include "third_party/skia/include/core/SkCanvas.h" @@ -29,12 +28,6 @@ void TextureLayer::Display() { TRACE_EVENT0("sky", "Layer::Display"); DCHECK(rasterizer_); RefPtr picture = RecordPicture(); - -#if 0 - SerializePicture( - "/data/data/org.chromium.mojo.shell/cache/layer0.skp", picture.get()); -#endif - texture_ = rasterizer_->Rasterize(picture.get()); }