| Index: cc/output/gl_renderer.cc
|
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
|
| index 3a488caf73cffb1e29bb7a232ea834e4b9a96496..81c4280288e01946cba32ba044269a49255c6d8d 100644
|
| --- a/cc/output/gl_renderer.cc
|
| +++ b/cc/output/gl_renderer.cc
|
| @@ -3512,13 +3512,13 @@ void GLRenderer::ScheduleOverlays(DrawingFrame* frame) {
|
| OverlayCandidateList& overlays = frame->overlay_list;
|
| for (const OverlayCandidate& overlay : overlays) {
|
| unsigned texture_id = 0;
|
| - if (overlay.use_output_surface_for_resource) {
|
| + if (overlay.resource_type == OverlayCandidate::USE_OUTPUT_SURFACE) {
|
| texture_id = output_surface_->GetOverlayTextureId();
|
| DCHECK(texture_id);
|
| - } else {
|
| + } else if (overlay.resource_type == OverlayCandidate::HAS_RESOURCE) {
|
| pending_overlay_resources_.push_back(
|
| make_scoped_ptr(new ResourceProvider::ScopedReadLockGL(
|
| - resource_provider_, overlay.resource_id)));
|
| + resource_provider_, overlay.resource.resource_id)));
|
| texture_id = pending_overlay_resources_.back()->texture_id();
|
| }
|
|
|
|
|