Switch back to the original brightness filter implementation.

cc/render_surface_filters.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 "base/logging.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
 #include "third_party/skia/include/effects/SkMagnifierImageFilter.h"
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include "third_party/skia/include/gpu/SkGrPixelRef.h"
 #include "ui/gfx/size_f.h"
 
 namespace cc {
 
 namespace {
 
 void getBrightnessMatrix(float amount, SkScalar matrix[20])
 {
+    // Spec implementation
+    // (http://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#brightnessEquivalent)
+    // <feFunc[R|G|B] type="linear" slope="[amount]">
     memset(matrix, 0, 20 * sizeof(SkScalar));
-    //    Old implementation, a la the draft spec, a straight-up scale,
-    //    representing <feFunc[R|G|B] type="linear" slope="[amount]">
-    //    (See http://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#brightnessEquivalent)
-    // matrix[0] = matrix[6] = matrix[12] = amount;
-    // matrix[18] = 1;
-    //    New implementation, a translation in color space, representing
-    //    <feFunc[R|G|B] type="linear" intercept="[amount]"/>
-    //    (See https://www.w3.org/Bugs/Public/show_bug.cgi?id=15647)
+    matrix[0] = matrix[6] = matrix[12] = amount;
+    matrix[18] = 1;
+}
+
+void getSaturatingBrightnessMatrix(float amount, SkScalar matrix[20])
+{
+    // Legacy implementation used by internal clients.
+    // <feFunc[R|G|B] type="linear" intercept="[amount]"/>
+    memset(matrix, 0, 20 * sizeof(SkScalar));
     matrix[0] = matrix[6] = matrix[12] = matrix[18] = 1;
     matrix[4] = matrix[9] = matrix[14] = amount * 255;
 }
 
 void getContrastMatrix(float amount, SkScalar matrix[20])
 {
     memset(matrix, 0, 20 * sizeof(SkScalar));
     matrix[0] = matrix[6] = matrix[12] = amount;
     matrix[4] = matrix[9] = matrix[14] = (-0.5f * amount + 0.5f) * 255;
     matrix[18] = 1;
@@ skipping 146 matching lines @@
         || componentNeedsClamping(matrix+15);
 }
 
 bool getColorMatrix(const WebKit::WebFilterOperation& op, SkScalar matrix[20])
 {
     switch (op.type()) {
     case WebKit::WebFilterOperation::FilterTypeBrightness: {
         getBrightnessMatrix(op.amount(), matrix);
         return true;
     }
+    case WebKit::WebFilterOperation::FilterTypeSaturatingBrightness: {
+        getSaturatingBrightnessMatrix(op.amount(), matrix);
+        return true;
+    }
     case WebKit::WebFilterOperation::FilterTypeContrast: {
         getContrastMatrix(op.amount(), matrix);
         return true;
     }
     case WebKit::WebFilterOperation::FilterTypeGrayscale: {
         getGrayscaleMatrix(1 - op.amount(), matrix);
         return true;
     }
     case WebKit::WebFilterOperation::FilterTypeSepia: {
         getSepiaMatrix(1 - op.amount(), matrix);
@@ skipping 134 matching lines @@
             newList.append(WebKit::WebFilterOperation::createColorMatrixFilter(accumulatedColorMatrix));
         haveAccumulatedColorMatrix = false;
 
         switch (op.type()) {
         case WebKit::WebFilterOperation::FilterTypeBlur:
         case WebKit::WebFilterOperation::FilterTypeDropShadow:
         case WebKit::WebFilterOperation::FilterTypeZoom:
             newList.append(op);
             break;
         case WebKit::WebFilterOperation::FilterTypeBrightness:
+        case WebKit::WebFilterOperation::FilterTypeSaturatingBrightness:
         case WebKit::WebFilterOperation::FilterTypeContrast:
         case WebKit::WebFilterOperation::FilterTypeGrayscale:
         case WebKit::WebFilterOperation::FilterTypeSepia:
         case WebKit::WebFilterOperation::FilterTypeSaturate:
         case WebKit::WebFilterOperation::FilterTypeHueRotate:
         case WebKit::WebFilterOperation::FilterTypeInvert:
         case WebKit::WebFilterOperation::FilterTypeOpacity:
         case WebKit::WebFilterOperation::FilterTypeColorMatrix:
-        default: // FIXME: temporary place holder to prevent build failures
             break;
         }
     }
     if (haveAccumulatedColorMatrix)
         newList.append(WebKit::WebFilterOperation::createColorMatrixFilter(accumulatedColorMatrix));
     return newList;
 }
 
 SkBitmap RenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filters, unsigned textureId, const gfx::SizeF& size, WebKit::WebGraphicsContext3D* context3D, GrContext* grContext)
 {
@@ skipping 46 matching lines @@
                                      op.zoomRect().width,
                                      op.zoomRect().height),
                     op.amount()));
             paint.setImageFilter(zoomFilter.get());
             canvas->saveLayer(0, &paint);
             canvas->drawBitmap(state.source(), 0, 0);
             canvas->restore();
             break;
         }
         case WebKit::WebFilterOperation::FilterTypeBrightness:
+        case WebKit::WebFilterOperation::FilterTypeSaturatingBrightness:
         case WebKit::WebFilterOperation::FilterTypeContrast:
         case WebKit::WebFilterOperation::FilterTypeGrayscale:
         case WebKit::WebFilterOperation::FilterTypeSepia:
         case WebKit::WebFilterOperation::FilterTypeSaturate:
         case WebKit::WebFilterOperation::FilterTypeHueRotate:
         case WebKit::WebFilterOperation::FilterTypeInvert:
         case WebKit::WebFilterOperation::FilterTypeOpacity:
-        default: // FIXME: temporary place holder to prevent build failures
             NOTREACHED();
             break;
         }
         state.swap();
     }
     context3D->flush();
     return state.source();
 }
 
 }  // namespace cc