summaryrefslogtreecommitdiffstats
path: root/cc/output
diff options
context:
space:
mode:
authorhendrikw <hendrikw@chromium.org>2014-12-10 13:12:26 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-10 21:12:44 +0000
commita5726698eac2e4d6d54fc35a557c26c4abe9bb31 (patch)
treece56d31166e202dd3adf7f201183f797575fb588 /cc/output
parentf3f301b2fffc0968242a2a14c582861a2cb2f80e (diff)
downloadchromium_src-a5726698eac2e4d6d54fc35a557c26c4abe9bb31.zip
chromium_src-a5726698eac2e4d6d54fc35a557c26c4abe9bb31.tar.gz
chromium_src-a5726698eac2e4d6d54fc35a557c26c4abe9bb31.tar.bz2
cc: Return null interface context for TestContextProvider
Unit tests that use TestContextProvider and gpu_rasterization_forced require a GrContext to create the SkSurface. We now return a GrContext created using GrGLCreateNullInterface. BUG=332502 Review URL: https://codereview.chromium.org/768113009 Cr-Commit-Position: refs/heads/master@{#307760}
Diffstat (limited to 'cc/output')
-rw-r--r--cc/output/gl_renderer.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index a32778a..13a98f6 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -155,8 +155,6 @@ class GLRenderer::ScopedUseGrContext {
public:
static scoped_ptr<ScopedUseGrContext> Create(GLRenderer* renderer,
DrawingFrame* frame) {
- if (!renderer->output_surface_->context_provider()->GrContext())
- return nullptr;
return make_scoped_ptr(new ScopedUseGrContext(renderer, frame));
}