cc: Add BitmapRasterWorkerPool.

cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/basictypes.h"
@@ skipping 28 matching lines @@
 #include "cc/layers/scrollbar_layer_impl_base.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/delegating_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
+#include "cc/resources/bitmap_raster_worker_pool.h"
 #include "cc/resources/eviction_tile_priority_queue.h"
 #include "cc/resources/gpu_raster_worker_pool.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/one_copy_raster_worker_pool.h"
 #include "cc/resources/picture_layer_tiling.h"
 #include "cc/resources/pixel_buffer_raster_worker_pool.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/resource_pool.h"
@@ skipping 25 matching lines @@
                              "LayerTreeHostImpl",
                              id);
     return;
   }
 
   TRACE_EVENT_ASYNC_END0("webkit", "LayerTreeHostImpl::SetVisible", id);
 }
 
 size_t GetMaxTransferBufferUsageBytes(cc::ContextProvider* context_provider,
                                       double refresh_rate) {
-  // Software compositing should not use this value in production. Just use a
-  // default value when testing uploads with the software compositor.
-  if (!context_provider)

[vmpstr, 2014/09/24 16:31:51]

Can you instead DCHECK(context_provider)

[reveman, 2014/09/24 17:25:27]

I think it was always awkward that we could pass NULL to this function. In
general, I think it's a bit silly to check if the first parameter passed to a
function is non-NULL. That DCHECK is better left to the caller who knows better
if it's needed.

Anyhow, I changed this to take a const ref instead as I think that's more
appropriate.

-    return std::numeric_limits<size_t>::max();
-
   // We want to make sure the default transfer buffer size is equal to the
   // amount of data that can be uploaded by the compositor to avoid stalling
   // the pipeline.
   // For reference Chromebook Pixel can upload 1MB in about 0.5ms.
   const size_t kMaxBytesUploadedPerMs = 1024 * 1024 * 2;
 
   // We need to upload at least enough work to keep the GPU process busy until
   // the next time it can handle a request to start more uploads from the
   // compositor. We assume that it will pick up any sent upload requests within
   // the time of a vsync, since the browser will want to swap a frame within
   // that time interval, and then uploads should have a chance to be processed.
   size_t ms_per_frame = std::floor(1000.0 / refresh_rate);
   size_t max_transfer_buffer_usage_bytes =
       ms_per_frame * kMaxBytesUploadedPerMs;
 
   // The context may request a lower limit based on the device capabilities.
   return std::min(
       context_provider->ContextCapabilities().max_transfer_buffer_usage_bytes,
       max_transfer_buffer_usage_bytes);
 }
 
 unsigned GetMapImageTextureTarget(cc::ContextProvider* context_provider) {
-  if (!context_provider)

[vmpstr, 2014/09/24 16:31:51]

Same here.

[reveman, 2014/09/24 17:25:27]

Same reply as above.

-    return GL_TEXTURE_2D;
-
   if (context_provider->ContextCapabilities().gpu.egl_image_external)
     return GL_TEXTURE_EXTERNAL_OES;
   if (context_provider->ContextCapabilities().gpu.texture_rectangle)
     return GL_TEXTURE_RECTANGLE_ARB;
 
   return GL_TEXTURE_2D;
 }
 
 size_t GetMaxStagingResourceCount() {
   // Upper bound for number of staging resource to allow.
@@ skipping 1852 matching lines @@
         ResourcePool::Create(resource_provider_.get(),
                              GL_TEXTURE_2D,
                              resource_provider_->best_texture_format());
 
     raster_worker_pool_ =
         OneCopyRasterWorkerPool::Create(proxy_->ImplThreadTaskRunner(),
                                         RasterWorkerPool::GetTaskGraphRunner(),
                                         context_provider,
                                         resource_provider_.get(),
                                         staging_resource_pool_.get());
-  } else if (!UseZeroCopyRasterizer() && context_provider) {
+  } else if (UseZeroCopyRasterizer() && context_provider) {

[vmpstr, 2014/09/24 16:31:51]

I think this whole if/else if sequence is better written as:

if (!context_provider) {
  ...
} else if (use_gpu_rasterization) {
  DCHECK(context_provider);
  ...
} else if (UseOneCopyRasterizer()) {
  ...
} ... {
} else {
  // context_provider && !(use_gpu_rasteriztion || UseZeroCopy || UseOneCopy)
}

It's just kind of awkward to check that we have context provider in every
if/else if, where we could just handle it not being there in the first if.

[reveman, 2014/09/24 17:25:27]

Yes, much better. Done.

+    resource_pool_ =
+        ResourcePool::Create(resource_provider_.get(),
+                             GetMapImageTextureTarget(context_provider),
+                             resource_provider_->best_texture_format());
+
+    raster_worker_pool_ =
+        ZeroCopyRasterWorkerPool::Create(proxy_->ImplThreadTaskRunner(),
+                                         RasterWorkerPool::GetTaskGraphRunner(),
+                                         resource_provider_.get());
+  } else if (context_provider) {
     resource_pool_ = ResourcePool::Create(
         resource_provider_.get(),
         GL_TEXTURE_2D,
         resource_provider_->memory_efficient_texture_format());
 
     raster_worker_pool_ = PixelBufferRasterWorkerPool::Create(
         proxy_->ImplThreadTaskRunner(),
         RasterWorkerPool::GetTaskGraphRunner(),
         context_provider,
         resource_provider_.get(),
         GetMaxTransferBufferUsageBytes(context_provider,
                                        settings_.refresh_rate));
   } else {
     resource_pool_ =
         ResourcePool::Create(resource_provider_.get(),
-                             GetMapImageTextureTarget(context_provider),
+                             GL_TEXTURE_2D,
                              resource_provider_->best_texture_format());
 
     raster_worker_pool_ =
-        ZeroCopyRasterWorkerPool::Create(proxy_->ImplThreadTaskRunner(),
-                                         RasterWorkerPool::GetTaskGraphRunner(),
-                                         resource_provider_.get());
+        BitmapRasterWorkerPool::Create(proxy_->ImplThreadTaskRunner(),
+                                       RasterWorkerPool::GetTaskGraphRunner(),
+                                       resource_provider_.get());
   }
 
   tile_manager_ =
       TileManager::Create(this,
                           proxy_->ImplThreadTaskRunner(),
                           resource_pool_.get(),
                           raster_worker_pool_->AsRasterizer(),
                           rendering_stats_instrumentation_);
 
   UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
   need_to_update_visible_tiles_before_draw_ = false;
 }
 
 void LayerTreeHostImpl::DestroyTileManager() {
   tile_manager_.reset();
   resource_pool_.reset();
   staging_resource_pool_.reset();
   raster_worker_pool_.reset();
 }
 
 bool LayerTreeHostImpl::UsePendingTreeForSync() const {
   // In impl-side painting, synchronize to the pending tree so that it has
   // time to raster before being displayed.
   return settings_.impl_side_painting;
 }
 
 bool LayerTreeHostImpl::UseZeroCopyRasterizer() const {
-  // Note: we use zero-copy by default when the renderer is using
-  // shared memory resources.
-  return (settings_.use_zero_copy ||
-          GetRendererCapabilities().using_shared_memory_resources) &&
-         GetRendererCapabilities().using_map_image;
+  return settings_.use_zero_copy && GetRendererCapabilities().using_map_image;
 }
 
 bool LayerTreeHostImpl::UseOneCopyRasterizer() const {
   // Sync query support is required by one-copy rasterizer.
   return settings_.use_one_copy && GetRendererCapabilities().using_map_image &&
          resource_provider_->use_sync_query();
 }
 
 void LayerTreeHostImpl::EnforceZeroBudget(bool zero_budget) {
   SetManagedMemoryPolicy(cached_managed_memory_policy_, zero_budget);
@@ skipping 1323 matching lines @@
 }
 
 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) {
   std::vector<PictureLayerImpl*>::iterator it =
       std::find(picture_layers_.begin(), picture_layers_.end(), layer);
   DCHECK(it != picture_layers_.end());
   picture_layers_.erase(it);
 }
 
 }  // namespace cc