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

Unified Diff: cc/quads/draw_quad_unittest.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 | « cc/output/renderer_pixeltest.cc ('k') | cc/quads/render_pass.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/draw_quad_unittest.cc
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index 0c17413f9552fc941a8e0d2ca1b11485465acf8b..671cf0074c4758ec92ba7fb1e49fa9c15f07ec44 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "cc/base/math_util.h"
+#include "cc/output/filter_operations.h"
#include "cc/quads/checkerboard_draw_quad.h"
#include "cc/quads/debug_border_draw_quad.h"
#include "cc/quads/io_surface_draw_quad.h"
@@ -22,7 +23,6 @@
#include "cc/resources/picture_pile_impl.h"
#include "cc/test/geometry_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebFilterOperations.h"
#include "third_party/skia/include/effects/SkBlurImageFilter.h"
#include "ui/gfx/transform.h"
@@ -361,11 +361,11 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
ResourceProvider::ResourceId mask_resource_id = 78;
gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24);
gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
- WebKit::WebFilterOperations filters;
- filters.append(WebKit::WebFilterOperation::createBlurFilter(1.f));
- WebKit::WebFilterOperations background_filters;
- background_filters.append(
- WebKit::WebFilterOperation::createGrayscaleFilter(1.f));
+ FilterOperations filters;
+ filters.Append(FilterOperation::CreateBlurFilter(1.f));
+ FilterOperations background_filters;
+ background_filters.Append(
+ FilterOperation::CreateGrayscaleFilter(1.f));
skia::RefPtr<SkImageFilter> filter =
skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
@@ -761,11 +761,11 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
ResourceProvider::ResourceId mask_resource_id = 78;
gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24);
gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
- WebKit::WebFilterOperations filters;
- filters.append(WebKit::WebFilterOperation::createBlurFilter(1.f));
- WebKit::WebFilterOperations background_filters;
- background_filters.append(
- WebKit::WebFilterOperation::createGrayscaleFilter(1.f));
+ FilterOperations filters;
+ filters.Append(FilterOperation::CreateBlurFilter(1.f));
+ FilterOperations background_filters;
+ background_filters.Append(
+ FilterOperation::CreateGrayscaleFilter(1.f));
skia::RefPtr<SkImageFilter> filter =
skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/quads/render_pass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698