| Index: cc/output/gl_renderer.cc
|
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
|
| index fb5de4edd084c4f6915697f5e7c6f9b020e677a7..688ad25f4f37c0ab0bbd1fd8ced5e2879c907e6a 100644
|
| --- a/cc/output/gl_renderer.cc
|
| +++ b/cc/output/gl_renderer.cc
|
| @@ -439,9 +439,9 @@ void GLRenderer::DrawDebugBorderQuad(const DrawingFrame* frame,
|
| }
|
|
|
| static inline SkBitmap ApplyFilters(GLRenderer* renderer,
|
| - const WebKit::WebFilterOperations& filters,
|
| + const FilterOperations& filters,
|
| ScopedResource* source_texture_resource) {
|
| - if (filters.isEmpty())
|
| + if (filters.IsEmpty())
|
| return SkBitmap();
|
|
|
| ContextProvider* offscreen_contexts =
|
| @@ -587,8 +587,8 @@ scoped_ptr<ScopedResource> GLRenderer::DrawBackgroundFilters(
|
| // FIXME: When this algorithm changes, update
|
| // LayerTreeHost::PrioritizeTextures() accordingly.
|
|
|
| - const WebKit::WebFilterOperations& filters = quad->background_filters;
|
| - DCHECK(!filters.isEmpty());
|
| + const FilterOperations& filters = quad->background_filters;
|
| + DCHECK(!filters.IsEmpty());
|
|
|
| // FIXME: We only allow background filters on an opaque render surface because
|
| // other surfaces may contain translucent pixels, and the contents behind
|
| @@ -603,7 +603,7 @@ scoped_ptr<ScopedResource> GLRenderer::DrawBackgroundFilters(
|
| contents_device_transform, SharedGeometryQuad().BoundingBox()));
|
|
|
| int top, right, bottom, left;
|
| - filters.getOutsets(top, right, bottom, left);
|
| + filters.GetOutsets(&top, &right, &bottom, &left);
|
| device_rect.Inset(-left, -top, -right, -bottom);
|
|
|
| device_rect.Intersect(frame->current_render_pass->output_rect);
|
| @@ -692,7 +692,7 @@ void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame,
|
| return;
|
|
|
| scoped_ptr<ScopedResource> background_texture;
|
| - if (!quad->background_filters.isEmpty()) {
|
| + if (!quad->background_filters.IsEmpty()) {
|
| // The pixels from the filtered background should completely replace the
|
| // current pixel values.
|
| bool disable_blending = blend_enabled();
|
|
|