Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Unified Diff: webkit/renderer/compositor_bindings/web_layer_impl.cc

Issue 16968002: Move implementation of WebFilterOperations into cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/renderer/compositor_bindings/web_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
index 8f0adb41e4111ab1c0e93f96dceb8156631a57b3..d1bfdbe86b2d7dcef2dc8b21aed56ab427c43bd5 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -16,6 +16,7 @@
#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;
@@ -155,11 +156,22 @@ WebColor WebLayerImpl::backgroundColor() const {
}
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 a
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) {

Powered by Google App Engine
This is Rietveld 408576698