[Merge to 2785] Finish plumbing for CALayerOverlay filter.

cc/output/gl_renderer.cc

 // Copyright 2010 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/output/gl_renderer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 3642 matching lines @@
         ca_layer_overlay.bounds_rect.height(),
     };
     GLboolean is_clipped = ca_layer_overlay.is_clipped;
     GLfloat clip_rect[4] = {ca_layer_overlay.clip_rect.x(),
                             ca_layer_overlay.clip_rect.y(),
                             ca_layer_overlay.clip_rect.width(),
                             ca_layer_overlay.clip_rect.height()};
     GLint sorting_context_id = ca_layer_overlay.sorting_context_id;
     GLfloat transform[16];
     ca_layer_overlay.transform.asColMajorf(transform);
-    unsigned filter = GL_LINEAR;
+    unsigned filter = ca_layer_overlay.filter;
     gl_->ScheduleCALayerCHROMIUM(
         texture_id, contents_rect, ca_layer_overlay.opacity,
         ca_layer_overlay.background_color, ca_layer_overlay.edge_aa_mask,
         bounds_rect, is_clipped, clip_rect, sorting_context_id, transform,
         filter);
   }
 }
 
 void GLRenderer::ScheduleOverlays(DrawingFrame* frame) {
   if (!frame->overlay_list.size())
@@ skipping 12 matching lines @@
       texture_id = pending_overlay_resources_.back()->texture_id();
     }
 
     context_support_->ScheduleOverlayPlane(
         overlay.plane_z_order, overlay.transform, texture_id,
         ToNearestRect(overlay.display_rect), overlay.uv_rect);
   }
 }
 
 }  // namespace cc