| Index: cc/output/software_renderer.cc
|
| diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
|
| index 0f6babc30ec265011291edf6732bbefedab4fc2a..0a04f098771111c7dcf8ee75142cb07cd2200b1f 100644
|
| --- a/cc/output/software_renderer.cc
|
| +++ b/cc/output/software_renderer.cc
|
| @@ -472,7 +472,9 @@ void SoftwareRenderer::DrawTextureQuad(const DrawingFrame* frame,
|
|
|
| void SoftwareRenderer::DrawTileQuad(const DrawingFrame* frame,
|
| const TileDrawQuad* quad) {
|
| - DCHECK(!output_surface_->ForcedDrawToSoftwareDevice());
|
| + // |resource_provider_| can be NULL in resourceless software draws, which
|
| + // should never produce tile quads in the first place.
|
| + DCHECK(resource_provider_);
|
| DCHECK(IsSoftwareResource(quad->resource_id));
|
|
|
| ResourceProvider::ScopedReadLockSoftware lock(resource_provider_,
|
|
|