Switch back to the original brightness filter implementation.

cc/render_surface_filters_unittest.cc

 // 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"
 
@@ skipping 37 matching lines @@
     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)));
 
-    // Several filters should never combine: brightness(amount > 0), blur, drop-shadow.
-    EXPECT_FALSE(isCombined(WebFilterOperation::createBrightnessFilter(0.5)));
-    EXPECT_FALSE(isCombined(WebFilterOperation::createBrightnessFilter(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] = {
@@ skipping 24 matching lines @@
         -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(0));
-    WebFilterOperation doesntCombine(WebFilterOperation::createBrightnessFilter(1));
+    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);
@@ skipping 12 matching lines @@
     optimized = RenderSurfaceFilters::optimize(filters);
     EXPECT_EQ(2u, optimized.size());
 
     filters.append(doesntCombine);
     optimized = RenderSurfaceFilters::optimize(filters);
     EXPECT_EQ(3u, optimized.size());
 }
 
 }  // namespace
 }  // namespace cc