| Index: cc/render_surface_filters.cc
|
| diff --git a/cc/render_surface_filters.cc b/cc/render_surface_filters.cc
|
| index 29c031cf5089319674a448d383e8c2855e9e5dc0..f04fbb984776414dc9f176dd48ad4f449e9e71af 100644
|
| --- a/cc/render_surface_filters.cc
|
| +++ b/cc/render_surface_filters.cc
|
| @@ -8,7 +8,6 @@
|
| #include "skia/ext/refptr.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/effects/SkBlurImageFilter.h"
|
| #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
|
| @@ -377,10 +376,9 @@ WebKit::WebFilterOperations RenderSurfaceFilters::optimize(const WebKit::WebFilt
|
| return newList;
|
| }
|
|
|
| -SkBitmap RenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filters, unsigned textureId, const gfx::SizeF& size, WebKit::WebGraphicsContext3D* context3D, GrContext* grContext)
|
| +SkBitmap RenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filters, unsigned textureId, gfx::SizeF size, GrContext* grContext)
|
| {
|
| - if (!context3D || !grContext)
|
| - return SkBitmap();
|
| + DCHECK(grContext);
|
|
|
| WebKit::WebFilterOperations optimizedFilters = optimize(filters);
|
| FilterBufferState state(grContext, size, textureId);
|
| @@ -448,7 +446,6 @@ SkBitmap RenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filters,
|
| }
|
| state.swap();
|
| }
|
| - context3D->flush();
|
| return state.source();
|
| }
|
|
|
|
|