| Index: cc/render_surface_filters_unittest.cc
|
| diff --git a/cc/render_surface_filters_unittest.cc b/cc/render_surface_filters_unittest.cc
|
| deleted file mode 100644
|
| index fdd0371e6aeb88dcc80b6abbbf6b10a8e58060eb..0000000000000000000000000000000000000000
|
| --- a/cc/render_surface_filters_unittest.cc
|
| +++ /dev/null
|
| @@ -1,146 +0,0 @@
|
| -// Copyright 2012 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 "cc/render_surface_filters.h"
|
| -
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
|
| -
|
| -using namespace WebKit;
|
| -
|
| -namespace cc {
|
| -namespace {
|
| -
|
| -// Checks whether op can be combined with a following color matrix.
|
| -bool isCombined(const WebFilterOperation& op)
|
| -{
|
| - WebFilterOperations filters;
|
| - filters.append(op);
|
| - filters.append(WebFilterOperation::createBrightnessFilter(0)); // brightness(0) is identity.
|
| - WebFilterOperations optimized = RenderSurfaceFilters::Optimize(filters);
|
| - return optimized.size() == 1;
|
| -}
|
| -
|
| -TEST(RenderSurfaceFiltersTest, testColorMatrixFiltersCombined)
|
| -{
|
| - // Several filters should always combine for any amount between 0 and 1:
|
| - // grayscale, saturate, invert, contrast, opacity.
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createGrayscaleFilter(0)));
|
| - // Note that we use 0.3f to avoid "argument is truncated from 'double' to
|
| - // 'float'" warnings on Windows. 0.5 is exactly representable as a float, so
|
| - // there is no warning.
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createGrayscaleFilter(0.3f)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createGrayscaleFilter(0.5)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createGrayscaleFilter(1)));
|
| -
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createSaturateFilter(0)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createSaturateFilter(0.3f)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createSaturateFilter(0.5)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createSaturateFilter(1)));
|
| -
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createInvertFilter(0)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createInvertFilter(0.3f)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createInvertFilter(0.5)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createInvertFilter(1)));
|
| -
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createContrastFilter(0)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createContrastFilter(0.3f)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createContrastFilter(0.5)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createContrastFilter(1)));
|
| -
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createOpacityFilter(0)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createOpacityFilter(0.3f)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createOpacityFilter(0.5)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createOpacityFilter(1)));
|
| -
|
| - // Brightness combines when amount <= 1
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createBrightnessFilter(0.5)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createBrightnessFilter(1)));
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createBrightnessFilter(1.5)));
|
| -
|
| - // SaturatingBrightness combines only when amount == 0
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createSaturatingBrightnessFilter(0)));
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createSaturatingBrightnessFilter(0.5)));
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createSaturatingBrightnessFilter(1)));
|
| -
|
| - // Several filters should never combine: blur, drop-shadow.
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createBlurFilter(3)));
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createDropShadowFilter(WebPoint(2, 2), 3, 0xffffffff)));
|
| -
|
| - // sepia and hue may or may not combine depending on the value.
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createSepiaFilter(0)));
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createSepiaFilter(1)));
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createHueRotateFilter(0)));
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createHueRotateFilter(180)));
|
| -
|
| - float matrix1[20] = {
|
| - 1, 0, 0, 0, 0,
|
| - 0, 1, 0, 0, 0,
|
| - 0, 0, 1, 0, 0,
|
| - 0, 0, 0, 1, 0,
|
| - };
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createColorMatrixFilter(matrix1)));
|
| -
|
| - float matrix2[20] = {
|
| - 1, 1, 0, 0, 0,
|
| - 0, 1, 0, 0, 0,
|
| - 0, 0, 1, 0, 0,
|
| - 0, 0, 0, 1, 0,
|
| - };
|
| - EXPECT_FALSE(isCombined(WebFilterOperation::createColorMatrixFilter(matrix2)));
|
| -
|
| - float matrix3[20] = {
|
| - 0.25, 0, 0, 0, 255*0.75,
|
| - 0, 1, 0, 0, 0,
|
| - 0, 0, 1, 0, 0,
|
| - 0, 0, 0, 1, 0,
|
| - };
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createColorMatrixFilter(matrix3)));
|
| -
|
| - float matrix4[20] = {
|
| - -0.25, 0.75, 0, 0, 255*0.25,
|
| - 0, 1, 0, 0, 0,
|
| - 0, 0, 1, 0, 0,
|
| - 0, 0, 0, 1, 0,
|
| - };
|
| - EXPECT_TRUE(isCombined(WebFilterOperation::createColorMatrixFilter(matrix4)));
|
| -}
|
| -
|
| -TEST(RenderSurfaceFiltersTest, testOptimize)
|
| -{
|
| - WebFilterOperation combines(WebFilterOperation::createBrightnessFilter(1));
|
| - WebFilterOperation doesntCombine(WebFilterOperation::createBrightnessFilter(1.5));
|
| -
|
| - WebFilterOperations filters;
|
| - WebFilterOperations optimized = RenderSurfaceFilters::Optimize(filters);
|
| - EXPECT_EQ(0u, optimized.size());
|
| -
|
| - filters.append(combines);
|
| - optimized = RenderSurfaceFilters::Optimize(filters);
|
| - EXPECT_EQ(1u, optimized.size());
|
| -
|
| - filters.append(combines);
|
| - optimized = RenderSurfaceFilters::Optimize(filters);
|
| - EXPECT_EQ(1u, optimized.size());
|
| -
|
| - filters.append(doesntCombine);
|
| - optimized = RenderSurfaceFilters::Optimize(filters);
|
| - EXPECT_EQ(1u, optimized.size());
|
| -
|
| - filters.append(combines);
|
| - optimized = RenderSurfaceFilters::Optimize(filters);
|
| - EXPECT_EQ(2u, optimized.size());
|
| -
|
| - filters.append(doesntCombine);
|
| - optimized = RenderSurfaceFilters::Optimize(filters);
|
| - EXPECT_EQ(2u, optimized.size());
|
| -
|
| - filters.append(doesntCombine);
|
| - optimized = RenderSurfaceFilters::Optimize(filters);
|
| - EXPECT_EQ(3u, optimized.size());
|
| -}
|
| -
|
| -} // namespace
|
| -} // namespace cc
|
|
|