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

Unified Diff: cc/output/renderer_pixeltest.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/render_surface_filters_unittest.cc ('k') | cc/quads/draw_quad_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/renderer_pixeltest.cc
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index 4d3eb30421e692633e12d077311abb448b6aca45..893e6a1ffd33bc63674e1655a55b32c34812a41b 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc
@@ -87,9 +87,9 @@ scoped_ptr<DrawQuad> CreateTestRenderPassDrawQuad(
0, // mask_resource_id
rect, // contents_changed_since_last_frame
gfx::RectF(), // mask_uv_rect
- WebKit::WebFilterOperations(), // foreground filters
+ FilterOperations(), // foreground filters
skia::RefPtr<SkImageFilter>(), // foreground filter
- WebKit::WebFilterOperations()); // background filters
+ FilterOperations()); // background filters
return quad.PassAs<DrawQuad>();
}
@@ -416,9 +416,9 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {
0,
pass_rect,
gfx::RectF(),
- WebKit::WebFilterOperations(),
+ FilterOperations(),
filter,
- WebKit::WebFilterOperations());
+ FilterOperations());
root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>());
@@ -518,9 +518,9 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {
0,
pass_rect,
gfx::RectF(),
- WebKit::WebFilterOperations(),
+ FilterOperations(),
filter,
- WebKit::WebFilterOperations());
+ FilterOperations());
root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>());
RenderPassList pass_list;
@@ -717,7 +717,7 @@ class RendererPixelTestWithBackgroundFilter
0, // mask_resource_id
filter_pass_content_rect_, // contents_changed_since_last_frame
gfx::RectF(), // mask_uv_rect
- WebKit::WebFilterOperations(), // filters
+ FilterOperations(), // filters
skia::RefPtr<SkImageFilter>(), // filter
this->background_filters_);
root_pass->quad_list.push_back(filter_pass_quad.PassAs<DrawQuad>());
@@ -779,7 +779,7 @@ class RendererPixelTestWithBackgroundFilter
}
RenderPassList pass_list_;
- WebKit::WebFilterOperations background_filters_;
+ FilterOperations background_filters_;
gfx::Transform filter_pass_to_target_transform_;
gfx::Rect filter_pass_content_rect_;
};
@@ -794,8 +794,8 @@ GLRendererPixelTestWithBackgroundFilter;
// TODO(skaslev): The software renderer does not support filters yet.
TEST_F(GLRendererPixelTestWithBackgroundFilter, InvertFilter) {
- this->background_filters_.append(
- WebKit::WebFilterOperation::createInvertFilter(1.f));
+ this->background_filters_.Append(
+ FilterOperation::CreateInvertFilter(1.f));
this->filter_pass_content_rect_ = gfx::Rect(this->device_viewport_size_);
this->filter_pass_content_rect_.Inset(12, 14, 16, 18);
« no previous file with comments | « cc/output/render_surface_filters_unittest.cc ('k') | cc/quads/draw_quad_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698