Merge 250273 "cc: Prevent usage of rasterize on-demand with dele..."

cc/output/delegating_renderer.cc

 // Copyright 2012 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/delegating_renderer.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 57 matching lines @@
 
   const ContextProvider::Capabilities& caps =
       output_surface_->context_provider()->ContextCapabilities();
 
   DCHECK(!caps.gpu.iosurface || caps.gpu.texture_rectangle);
 
   capabilities_.using_egl_image = caps.gpu.egl_image_external;
   capabilities_.using_map_image =
       settings_->use_map_image && caps.gpu.map_image;
 
+  capabilities_.allow_rasterize_on_demand = false;
+
   return true;
 }
 
 DelegatingRenderer::~DelegatingRenderer() {}
 
 const RendererCapabilitiesImpl& DelegatingRenderer::Capabilities() const {
   return capabilities_;
 }
 
 bool DelegatingRenderer::CanReadPixels() const { return false; }
@@ skipping 89 matching lines @@
   gpu::ManagedMemoryStats stats;
   stats.bytes_required = bytes_visible;
   stats.bytes_nice_to_have = bytes_visible_and_nearby;
   stats.bytes_allocated = bytes_allocated;
   stats.backbuffer_requested = false;
 
   context_provider->ContextSupport()->SendManagedMemoryStats(stats);
 }
 
 }  // namespace cc