Mac Overlays: Allow SolidColor and Tile quads to be candidates for overlays.

cc/output/gl_renderer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/gl_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
@@ skipping 3494 matching lines @@
 }
 
 void GLRenderer::ScheduleOverlays(DrawingFrame* frame) {
   if (!frame->overlay_list.size())
     return;
 
   ResourceProvider::ResourceIdArray resources;
   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();
     }
 
     context_support_->ScheduleOverlayPlane(
         overlay.plane_z_order, overlay.transform, texture_id,
         ToNearestRect(overlay.display_rect), overlay.uv_rect);
   }
 }
 
 }  // namespace cc