Index: media/renderers/skcanvas_video_renderer_unittest.cc |
diff --git a/media/renderers/skcanvas_video_renderer_unittest.cc b/media/renderers/skcanvas_video_renderer_unittest.cc |
index 7034b89747977cd8a351c4b01a7680c598f7016c..dc832b310c855830542154489f5c73e8194bec4f 100644 |
--- a/media/renderers/skcanvas_video_renderer_unittest.cc |
+++ b/media/renderers/skcanvas_video_renderer_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "cc/paint/skia_paint_canvas.h" |
#include "gpu/GLES2/gl2extchromium.h" |
#include "gpu/command_buffer/client/gles2_interface_stub.h" |
+#include "gpu/command_buffer/common/capabilities.h" |
#include "media/base/timestamp_constants.h" |
#include "media/base/video_frame.h" |
#include "media/base/video_util.h" |
@@ -710,14 +711,7 @@ TEST_F(SkCanvasVideoRendererTest, TexImage2D_Y16_RGBA32F) { |
CreateTestY16Frame(gfx::Size(stride, offset_y + height), rect, |
memory.get(), cropped_frame()->timestamp()); |
- // Create GL context. |
- sk_sp<const GrGLInterface> null_interface(GrGLCreateNullInterface()); |
- sk_sp<GrContext> gr_context(GrContext::Create( |
- kOpenGL_GrBackend, |
- reinterpret_cast<GrBackendContext>(null_interface.get()))); |
TestGLES2Interface gles2; |
- Context3D context_3d(&gles2, gr_context.get()); |
- |
// Bind the texImage2D callback to verify the uint16 to float32 conversion. |
gles2.teximage2d_callback_ = |
base::Bind([](GLenum target, GLint level, GLint internalformat, |
@@ -743,9 +737,9 @@ TEST_F(SkCanvasVideoRendererTest, TexImage2D_Y16_RGBA32F) { |
} |
} |
}); |
- SkCanvasVideoRenderer::TexImage2D(GL_TEXTURE_2D, &gles2, video_frame.get(), 0, |
- GL_RGBA, GL_RGBA, GL_FLOAT, true /*flip_y*/, |
- true); |
+ SkCanvasVideoRenderer::TexImage2D( |
+ GL_TEXTURE_2D, 0, &gles2, gpu::Capabilities(), video_frame.get(), 0, |
+ GL_RGBA, GL_RGBA, GL_FLOAT, true /*flip_y*/, true); |
} |
TEST_F(SkCanvasVideoRendererTest, TexSubImage2D_Y16_R32F) { |
@@ -765,14 +759,7 @@ TEST_F(SkCanvasVideoRendererTest, TexSubImage2D_Y16_R32F) { |
CreateTestY16Frame(gfx::Size(stride, offset_y + height), rect, |
memory.get(), cropped_frame()->timestamp()); |
- // Create GL context. |
- sk_sp<const GrGLInterface> null_interface(GrGLCreateNullInterface()); |
- sk_sp<GrContext> gr_context(GrContext::Create( |
- kOpenGL_GrBackend, |
- reinterpret_cast<GrBackendContext>(null_interface.get()))); |
TestGLES2Interface gles2; |
- Context3D context_3d(&gles2, gr_context.get()); |
- |
// Bind the texImage2D callback to verify the uint16 to float32 conversion. |
gles2.texsubimage2d_callback_ = base::Bind([]( |
GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, |