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

Unified Diff: ui/compositor/layer.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
« no previous file with comments | « ui/compositor/DEPS ('k') | webkit/renderer/compositor_bindings/compositor_bindings.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 09009eae4bea691e2d975b00da9ec28c3a4b71df..37614cc54bdaf43cd7026d5c793eff2a96e6eed3 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -16,9 +16,9 @@
#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"
@@ -314,22 +314,22 @@ void Layer::SetBackgroundZoom(float zoom, int inset) {
}
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_));
}
@@ -337,14 +337,12 @@ void Layer::SetLayerFilters() {
}
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_));
}
« no previous file with comments | « ui/compositor/DEPS ('k') | webkit/renderer/compositor_bindings/compositor_bindings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698