Move implementation of WebFilterOperations into cc

webkit/renderer/compositor_bindings/web_layer_impl.cc

 // Copyright 2011 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 "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 #include "base/strings/string_util.h"
 #include "cc/animation/animation.h"
 #include "cc/base/region.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "third_party/WebKit/public/platform/WebCompositingReasons.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "webkit/renderer/compositor_bindings/web_animation_impl.h"
+#include "webkit/renderer/compositor_bindings/web_filter_operations_impl.h"
 
 using cc::Animation;
 using cc::Layer;
 using WebKit::WebLayer;
 using WebKit::WebFloatPoint;
 using WebKit::WebVector;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebColor;
 using WebKit::WebFilterOperations;
@@ skipping 119 matching lines @@
 
 void WebLayerImpl::setBackgroundColor(WebColor color) {
   layer_->SetBackgroundColor(color);
 }
 
 WebColor WebLayerImpl::backgroundColor() const {
   return layer_->background_color();
 }
 
 void WebLayerImpl::setFilters(const WebFilterOperations& filters) {
-  layer_->SetFilters(filters);
+#if WEB_FILTER_OPERATIONS_IS_VIRTUAL
+  layer_->SetFilters(static_cast<const WebFilterOperationsImpl&>(
+      filters).AsFilterOperations());

[jamesr, 2013/06/18 23:08:52]

odd wrapping and casting. this probably deserves an intermediate variable to
hold the result of the downcast then the actual call

[ajuma, 2013/06/19 17:08:30]

Done.

+#else
+  layer_->SetFilters(ConvertWebFilterOperationsToFilterOperations(filters));
+#endif
 }
 
 void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) {
-  layer_->SetBackgroundFilters(filters);
+#if WEB_FILTER_OPERATIONS_IS_VIRTUAL
+  layer_->SetBackgroundFilters(static_cast<const WebFilterOperationsImpl&>(
+      filters).AsFilterOperations());
+#else
+  layer_->SetBackgroundFilters(
+      ConvertWebFilterOperationsToFilterOperations(filters));
+#endif
 }
 
 void WebLayerImpl::setFilter(SkImageFilter* filter) {
   layer_->SetFilter(skia::SharePtr(filter));
 }
 
 void WebLayerImpl::setDebugName(WebKit::WebString name) {
   layer_->SetDebugName(UTF16ToASCII(name));
 }
 
@@ skipping 169 matching lines @@
 void WebLayerImpl::setScrollClient(
     WebKit::WebLayerScrollClient* scroll_client) {
   layer_->set_layer_scroll_client(scroll_client);
 }
 
 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
 
 Layer* WebLayerImpl::layer() const { return layer_.get(); }
 
 }  // namespace WebKit