Stop incorrectly caching brightness values

chrome/browser/android/compositor/layer/content_layer.cc

 // Copyright 2014 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 "chrome/browser/android/compositor/layer/content_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_lists.h"
 #include "chrome/browser/android/compositor/layer/thumbnail_layer.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
@@ skipping 113 matching lines @@
       SetOpacityOnLeaf(layer_->children()[i], content_alpha_override);
   }
 
   if (!content_layer_draws && !static_attached_)
     content_bounds = gfx::Size(0, 0);
 
   layer_->SetBounds(content_bounds);
 
   // Only worry about saturation on the static layer.
   if (static_layer.get()) {
-    if (saturation != saturation_) {
-      saturation_ = saturation;
-      cc::FilterOperations filters;
-      if (saturation_ < 1.0f)
-        filters.Append(cc::FilterOperation::CreateSaturateFilter(saturation_));
-      static_layer->layer()->SetFilters(filters);
+    static_filter_operations_.Clear();
+    if (saturation < 1.0f) {
+      static_filter_operations_.Append(
+          cc::FilterOperation::CreateSaturateFilter(saturation));
     }
+    static_layer->layer()->SetFilters(static_filter_operations_);
   }
 
   // Only worry about brightness on the content layer.
   if (content_layer.get()) {
-    if (brightness != brightness_) {
-      brightness_ = brightness;
-      cc::FilterOperations filters;
-      if (brightness_ < 1.f) {
-        filters.Append(
-            cc::FilterOperation::CreateBrightnessFilter(brightness_));
-      }
-      content_layer->SetFilters(filters);
+    content_filter_operations_.Clear();
+    if (brightness < 1.0f) {
+      content_filter_operations_.Append(
+          cc::FilterOperation::CreateBrightnessFilter(brightness));
     }
+    content_layer->SetFilters(content_filter_operations_);
   }
 }
 
 gfx::Size ContentLayer::GetContentSize() {
   if (content_attached_ && DoesLeafDrawContents(layer()->children()[0]))
     return layer_->children()[0]->bounds();
   return gfx::Size(0, 0);
 }
 
 scoped_refptr<cc::Layer> ContentLayer::layer() {
   return layer_;
 }
 
 ContentLayer::ContentLayer(TabContentManager* tab_content_manager)
     : layer_(cc::Layer::Create()),
       content_attached_(false),
       static_attached_(false),
-      saturation_(1.0f),
-      brightness_(1.0f),
       tab_content_manager_(tab_content_manager) {
 }
 
 ContentLayer::~ContentLayer() {
 }
 
 void ContentLayer::SetContentLayer(scoped_refptr<cc::Layer> layer) {
   // Check indices
   // content_attached_, expect at least 1 child.
   DCHECK(!content_attached_ || layer_->children().size() > 0);
@@ skipping 36 matching lines @@
   if (!new_static_layer.get()) {
     if (static_layer_.get()) {
       static_layer_->layer()->RemoveFromParent();
       static_layer_ = nullptr;
     }
     static_attached_ = false;
     return;
   }
   static_layer_ = new_static_layer;
   static_layer_->AddSelfToParentOrReplaceAt(layer_, content_attached_ ? 1 : 0);
-  saturation_ = -1.0f;
   static_layer_->layer()->SetIsDrawable(true);
   static_attached_ = true;
 }
 
 void ContentLayer::ClipContentLayer(scoped_refptr<cc::Layer> content_layer,
                                     gfx::Rect clipping,
                                     gfx::Size content_size) {
   if (!content_layer.get())
     return;
 
@@ skipping 13 matching lines @@
 
 void ContentLayer::ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer,
                                    gfx::Rect clipping) {
   if (!static_layer.get())
     return;
   static_layer->Clip(clipping);
 }
 
 }  //  namespace android
 }  //  namespace chrome