| Index: services/image_decoder/image_decoder_impl_unittest.cc
|
| diff --git a/services/image_decoder/image_decoder_impl_unittest.cc b/services/image_decoder/image_decoder_impl_unittest.cc
|
| deleted file mode 100644
|
| index f75e8ec249f6fbc63248c4c75d52020d412f303c..0000000000000000000000000000000000000000
|
| --- a/services/image_decoder/image_decoder_impl_unittest.cc
|
| +++ /dev/null
|
| @@ -1,164 +0,0 @@
|
| -// Copyright 2016 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 <memory>
|
| -#include <vector>
|
| -
|
| -#include "base/bind.h"
|
| -#include "base/lazy_instance.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "gin/array_buffer.h"
|
| -#include "gin/public/isolate_holder.h"
|
| -#include "services/image_decoder/image_decoder_impl.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -#include "third_party/WebKit/public/platform/scheduler/utility/webthread_impl_for_utility_thread.h"
|
| -#include "third_party/WebKit/public/web/WebKit.h"
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| -#include "ui/gfx/codec/jpeg_codec.h"
|
| -
|
| -#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
| -#include "gin/v8_initializer.h"
|
| -#endif
|
| -
|
| -namespace image_decoder {
|
| -
|
| -namespace {
|
| -
|
| -const int64_t kTestMaxImageSize = 128 * 1024;
|
| -
|
| -bool CreateJPEGImage(int width,
|
| - int height,
|
| - SkColor color,
|
| - std::vector<unsigned char>* output) {
|
| - SkBitmap bitmap;
|
| - bitmap.allocN32Pixels(width, height);
|
| - bitmap.eraseColor(color);
|
| -
|
| - const int kQuality = 50;
|
| - if (!gfx::JPEGCodec::Encode(
|
| - static_cast<const unsigned char*>(bitmap.getPixels()),
|
| - gfx::JPEGCodec::FORMAT_SkBitmap, width, height,
|
| - static_cast<int>(bitmap.rowBytes()), kQuality, output)) {
|
| - LOG(ERROR) << "Unable to encode " << width << "x" << height << " bitmap";
|
| - return false;
|
| - }
|
| - return true;
|
| -}
|
| -
|
| -class Request {
|
| - public:
|
| - explicit Request(ImageDecoderImpl* decoder) : decoder_(decoder) {}
|
| -
|
| - void DecodeImage(const std::vector<unsigned char>& image, bool shrink) {
|
| - decoder_->DecodeImage(
|
| - image, mojom::ImageCodec::DEFAULT, shrink, kTestMaxImageSize,
|
| - gfx::Size(), // Take the smallest frame (there's only one frame).
|
| - base::Bind(&Request::OnRequestDone, base::Unretained(this)));
|
| - }
|
| -
|
| - const SkBitmap& bitmap() const { return bitmap_; }
|
| -
|
| - private:
|
| - void OnRequestDone(const SkBitmap& result_image) { bitmap_ = result_image; }
|
| -
|
| - ImageDecoderImpl* decoder_;
|
| - SkBitmap bitmap_;
|
| -};
|
| -
|
| -// We need to ensure that Blink and V8 are initialized in order to use content's
|
| -// image decoding call.
|
| -class BlinkInitializer : public blink::Platform {
|
| - public:
|
| - BlinkInitializer()
|
| - : main_thread_(new blink::scheduler::WebThreadImplForUtilityThread()) {
|
| -#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
| - gin::V8Initializer::LoadV8Snapshot();
|
| - gin::V8Initializer::LoadV8Natives();
|
| -#endif
|
| -
|
| - blink::initialize(this);
|
| - }
|
| -
|
| - ~BlinkInitializer() override {}
|
| -
|
| - blink::WebThread* currentThread() override { return main_thread_.get(); }
|
| -
|
| - private:
|
| - std::unique_ptr<blink::scheduler::WebThreadImplForUtilityThread> main_thread_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(BlinkInitializer);
|
| -};
|
| -
|
| -base::LazyInstance<BlinkInitializer>::Leaky g_blink_initializer =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -class ImageDecoderImplTest : public testing::Test {
|
| - public:
|
| - ImageDecoderImplTest() : decoder_(nullptr) {}
|
| - ~ImageDecoderImplTest() override {}
|
| -
|
| - void SetUp() override { g_blink_initializer.Get(); }
|
| -
|
| - protected:
|
| - ImageDecoderImpl* decoder() { return &decoder_; }
|
| -
|
| - private:
|
| - base::MessageLoop message_loop_;
|
| - ImageDecoderImpl decoder_;
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -// Test that DecodeImage() doesn't return image message > (max message size)
|
| -TEST_F(ImageDecoderImplTest, DecodeImageSizeLimit) {
|
| - // Approx max height for 3:2 image that will fit in the allotted space.
|
| - // 1.5 for width/height ratio, 4 for bytes/pixel.
|
| - int max_height_for_msg = sqrt(kTestMaxImageSize / (1.5 * 4));
|
| - int base_msg_size = sizeof(skia::mojom::Bitmap::Data_);
|
| -
|
| - // Sizes which should trigger dimension-halving 0, 1 and 2 times
|
| - int heights[] = {max_height_for_msg - 10,
|
| - max_height_for_msg + 10,
|
| - 2 * max_height_for_msg + 10};
|
| - int widths[] = {heights[0] * 3 / 2, heights[1] * 3 / 2, heights[2] * 3 / 2};
|
| - for (size_t i = 0; i < arraysize(heights); i++) {
|
| - std::vector<unsigned char> jpg;
|
| - ASSERT_TRUE(CreateJPEGImage(widths[i], heights[i], SK_ColorRED, &jpg));
|
| -
|
| - Request request(decoder());
|
| - request.DecodeImage(jpg, true);
|
| - ASSERT_FALSE(request.bitmap().isNull());
|
| -
|
| - // Check that image has been shrunk appropriately
|
| - EXPECT_LT(request.bitmap().computeSize64() + base_msg_size,
|
| - kTestMaxImageSize);
|
| -// Android does its own image shrinking for memory conservation deeper in
|
| -// the decode, so more specific tests here won't work.
|
| -#if !defined(OS_ANDROID)
|
| - EXPECT_EQ(widths[i] >> i, request.bitmap().width());
|
| - EXPECT_EQ(heights[i] >> i, request.bitmap().height());
|
| -
|
| - // Check that if resize not requested and image exceeds IPC size limit,
|
| - // an empty image is returned
|
| - if (heights[i] > max_height_for_msg) {
|
| - Request request(decoder());
|
| - request.DecodeImage(jpg, false);
|
| - EXPECT_TRUE(request.bitmap().isNull());
|
| - }
|
| -#endif
|
| - }
|
| -}
|
| -
|
| -TEST_F(ImageDecoderImplTest, DecodeImageFailed) {
|
| - // The "jpeg" is just some "random" data;
|
| - const char kRandomData[] = "u gycfy7xdjkhfgui bdui ";
|
| - std::vector<unsigned char> jpg(kRandomData,
|
| - kRandomData + sizeof(kRandomData));
|
| -
|
| - Request request(decoder());
|
| - request.DecodeImage(jpg, false);
|
| - EXPECT_TRUE(request.bitmap().isNull());
|
| -}
|
| -
|
| -} // namespace image_decoder
|
|
|