Move implementation of WebFilterOperations into cc

ui/compositor/layer.cc

 // Copyright (c) 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 "ui/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/scoped_ptr_algorithm.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/delegated_frame_data.h"
+#include "cc/output/filter_operation.h"
+#include "cc/output/filter_operations.h"
 #include "cc/resources/transferable_resource.h"
-#include "third_party/WebKit/public/platform/WebFilterOperation.h"
-#include "third_party/WebKit/public/platform/WebFilterOperations.h"
 #include "ui/base/animation/animation.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/size_conversions.h"
@@ skipping 275 matching lines @@
 }
 
 void Layer::SetBackgroundZoom(float zoom, int inset) {
   zoom_ = zoom;
   zoom_inset_ = inset;
 
   SetLayerBackgroundFilters();
 }
 
 void Layer::SetLayerFilters() {
-  WebKit::WebFilterOperations filters;
+  cc::FilterOperations filters;
   if (layer_saturation_) {
-    filters.append(WebKit::WebFilterOperation::createSaturateFilter(
+    filters.Append(cc::FilterOperation::CreateSaturateFilter(
         layer_saturation_));
   }
   if (layer_grayscale_) {
-    filters.append(WebKit::WebFilterOperation::createGrayscaleFilter(
+    filters.Append(cc::FilterOperation::CreateGrayscaleFilter(
         layer_grayscale_));
   }
   if (layer_inverted_)
-    filters.append(WebKit::WebFilterOperation::createInvertFilter(1.0));
+    filters.Append(cc::FilterOperation::CreateInvertFilter(1.0));
   // Brightness goes last, because the resulting colors neeed clamping, which
   // cause further color matrix filters to be applied separately. In this order,
   // they all can be combined in a single pass.
   if (layer_brightness_) {
-    filters.append(WebKit::WebFilterOperation::createSaturatingBrightnessFilter(
+    filters.Append(cc::FilterOperation::CreateSaturatingBrightnessFilter(
         layer_brightness_));
   }
 
   cc_layer_->SetFilters(filters);
 }
 
 void Layer::SetLayerBackgroundFilters() {
-  WebKit::WebFilterOperations filters;
-  if (zoom_ != 1) {
-    filters.append(WebKit::WebFilterOperation::createZoomFilter(zoom_,
-                                                                zoom_inset_));
-  }
+  cc::FilterOperations filters;
+  if (zoom_ != 1)
+    filters.Append(cc::FilterOperation::CreateZoomFilter(zoom_, zoom_inset_));
 
   if (background_blur_radius_) {
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(
+    filters.Append(cc::FilterOperation::CreateBlurFilter(
         background_blur_radius_));
   }
 
   cc_layer_->SetBackgroundFilters(filters);
 }
 
 float Layer::GetTargetOpacity() const {
   if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::OPACITY))
     return animator_->GetTargetOpacity();
@@ skipping 615 matching lines @@
   cc_layer_->SetBounds(ConvertSizeToPixel(this, size));
 }
 
 void Layer::RecomputePosition() {
   cc_layer_->SetPosition(gfx::ScalePoint(
         gfx::PointF(bounds_.x(), bounds_.y()),
         device_scale_factor_));
 }
 
 }  // namespace ui