summaryrefslogtreecommitdiffstats
path: root/cc/test/render_pass_test_utils.cc
diff options
context:
space:
mode:
authorajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-25 18:49:29 +0000
committerajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-25 18:49:29 +0000
commitae6b1a7f60846352cc37858778d30886970f1582 (patch)
tree63f3db7cd40160fc2f978ccb1c86f36f589a8a13 /cc/test/render_pass_test_utils.cc
parent5e2c4d7c13baad8a246dd1f200636235f07b38d7 (diff)
downloadchromium_src-ae6b1a7f60846352cc37858778d30886970f1582.zip
chromium_src-ae6b1a7f60846352cc37858778d30886970f1582.tar.gz
chromium_src-ae6b1a7f60846352cc37858778d30886970f1582.tar.bz2
Move implementation of WebFilterOperations into cc
This moves the implementation of WebFilterOperations into cc, and (behind an #ifdef) defines a WebFilterOperationsImpl class that implements the WebFilterOperations interface by wrapping a cc::FilterOperations. With this change, cc and ui/compositor no longer need to include WebFilterOperations.h. BUG=181613 Review URL: https://chromiumcodereview.appspot.com/16968002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/render_pass_test_utils.cc')
-rw-r--r--cc/test/render_pass_test_utils.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
index a102de0..ef79fb5 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -85,8 +85,8 @@ void AddRenderPassQuad(TestRenderPass* to_pass,
gfx::Transform(), output_rect.size(), output_rect, output_rect, false, 1);
scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
quad->SetNew(shared_state, output_rect, contributing_pass->id, false, 0,
- output_rect, gfx::RectF(), WebKit::WebFilterOperations(),
- skia::RefPtr<SkImageFilter>(), WebKit::WebFilterOperations());
+ output_rect, gfx::RectF(), FilterOperations(),
+ skia::RefPtr<SkImageFilter>(), FilterOperations());
quad_sink.Append(quad.PassAs<DrawQuad>(), &data);
}
@@ -106,8 +106,8 @@ void AddRenderPassQuad(TestRenderPass* to_pass,
scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
quad->SetNew(shared_state, output_rect, contributing_pass->id, false,
mask_resource_id, output_rect, gfx::RectF(),
- WebKit::WebFilterOperations(),
- filter, WebKit::WebFilterOperations());
+ FilterOperations(),
+ filter, FilterOperations());
quad_sink.Append(quad.PassAs<DrawQuad>(), &data);
}