Pass resourceless software mode in BeginFrameArgs

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 226 matching lines @@
       memory_history_(MemoryHistory::Create()),
       debug_rect_history_(DebugRectHistory::Create()),
       texture_mailbox_deleter_(new TextureMailboxDeleter(
           proxy_->HasImplThread() ? proxy_->ImplThreadTaskRunner()
                                   : proxy_->MainThreadTaskRunner())),
       max_memory_needed_bytes_(0),
       zero_budget_(false),
       device_scale_factor_(1.f),
       overhang_ui_resource_id_(0),
       overdraw_bottom_height_(0.f),
+      resourceless_software_draw_(false),
       device_viewport_valid_for_tile_management_(true),
       begin_impl_frame_interval_(BeginFrameArgs::DefaultInterval()),
       animation_registrar_(AnimationRegistrar::Create()),
       rendering_stats_instrumentation_(rendering_stats_instrumentation),
       micro_benchmark_controller_(this),
       need_to_update_visible_tiles_before_draw_(false),
 #if DCHECK_IS_ON
       did_lose_called_(false),
 #endif
       shared_bitmap_manager_(manager),
@@ skipping 285 matching lines @@
   }
   return value.PassAs<base::Value>();
 }
 
 void LayerTreeHostImpl::FrameData::AppendRenderPass(
     scoped_ptr<RenderPass> render_pass) {
   render_passes_by_id[render_pass->id] = render_pass.get();
   render_passes.push_back(render_pass.Pass());
 }
 
-static DrawMode GetDrawMode(OutputSurface* output_surface) {
-  if (output_surface->ForcedDrawToSoftwareDevice()) {
+static DrawMode GetDrawMode(bool resourceless_software,

[danakj, 2014/07/09 17:21:07]

how about making this not static, and stop passing things in, then we can make
this method public, and use that from LTI, instead of making the
resourceless_software_mode_ flag public, to avoid different ways of checking for
the same thing?

[boliu, 2014/07/09 20:59:50]

Done.

+                            OutputSurface* output_surface) {
+  if (resourceless_software) {
     return DRAW_MODE_RESOURCELESS_SOFTWARE;
   } else if (output_surface->context_provider()) {
     return DRAW_MODE_HARDWARE;
   } else {
     DCHECK_EQ(!output_surface->software_device(),
               output_surface->capabilities().delegated_rendering &&
                   !output_surface->capabilities().deferred_gl_initialization)
         << output_surface->capabilities().delegated_rendering << " "
         << output_surface->capabilities().deferred_gl_initialization;
     return DRAW_MODE_SOFTWARE;
@@ skipping 207 matching lines @@
   // still draw the frame. However when the layer being checkerboarded is moving
   // due to an impl-animation, we drop the frame to avoid flashing due to the
   // texture suddenly appearing in the future.
   DrawResult draw_result = DRAW_SUCCESS;
   // When we have a copy request for a layer, we need to draw no matter
   // what, as the layer may disappear after this frame.
   bool have_copy_request = false;
 
   int layers_drawn = 0;
 
-  const DrawMode draw_mode = GetDrawMode(output_surface_.get());
+  const DrawMode draw_mode =
+      GetDrawMode(resourceless_software_draw_, output_surface_.get());
 
   LayerIteratorType end =
       LayerIteratorType::End(frame->render_surface_layer_list);
   for (LayerIteratorType it =
            LayerIteratorType::Begin(frame->render_surface_layer_list);
        it != end;
        ++it) {
     RenderPass::Id target_render_pass_id =
         it.target_render_surface_layer()->render_surface()->RenderPassId();
     RenderPass* target_render_pass =
@@ skipping 116 matching lines @@
     LayerImpl* layer = active_tree_->LayersWithCopyOutputRequest().back();
     layer->TakeCopyRequestsAndTransformToTarget(&requests_to_abort);
   }
   for (size_t i = 0; i < requests_to_abort.size(); ++i)
     requests_to_abort[i]->SendEmptyResult();
 
   // If we're making a frame to draw, it better have at least one render pass.
   DCHECK(!frame->render_passes.empty());
 
   // Should only have one render pass in resourceless software mode.
-  if (output_surface_->ForcedDrawToSoftwareDevice())
+  if (resourceless_software_draw_)

[danakj, 2014/07/09 17:21:07]

can you change this to be based on the draw_mode, and can you move this into the
DCHECK so we don't pay for this when DCHECKs are off?

like DCHECK(draw_mode != RESOURCLESS || passes.size() == 1u) << passes.size();

[boliu, 2014/07/09 20:59:50]

Done.

     DCHECK_EQ(1u, frame->render_passes.size());
 
   return draw_result;
 }
 
 void LayerTreeHostImpl::MainThreadHasStoppedFlinging() {
   if (input_handler_client_)
     input_handler_client_->MainThreadHasStoppedFlinging();
 }
 
@@ skipping 369 matching lines @@
   }
 
   if (needs_commit)
     client_->SetNeedsCommitOnImplThread();
 }
 
 void LayerTreeHostImpl::SetExternalDrawConstraints(
     const gfx::Transform& transform,
     const gfx::Rect& viewport,
     const gfx::Rect& clip,
+    bool resourceless_software_draw,
     bool valid_for_tile_management) {
-  if (external_transform_ != transform || external_viewport_ != viewport) {
+  if (external_transform_ != transform || external_viewport_ != viewport ||
+      resourceless_software_draw_ != resourceless_software_draw) {

[brianderson, 2014/07/08 21:26:12]

Is this the part that fixes the bug?

Was the point of removing OutputSurface::ForcedDrawToSoftwareDevice just to
clean up code? Are ForcedDrawToSoftwareDevice and resourceless_software_draw_
equivalent?

[boliu, 2014/07/08 21:31:14]

Yes
Yes they are meant to be equivalent. It's more of a clean up. See the discussion
in crbug.com/391829

     active_tree_->set_needs_update_draw_properties();
   }
 
   external_transform_ = transform;
   external_viewport_ = viewport;
   external_clip_ = clip;
+  resourceless_software_draw_ = resourceless_software_draw;
   device_viewport_valid_for_tile_management_ = valid_for_tile_management;
 }
 
 void LayerTreeHostImpl::SetNeedsRedrawRect(const gfx::Rect& damage_rect) {
   if (damage_rect.IsEmpty())
     return;
   NotifySwapPromiseMonitorsOfSetNeedsRedraw();
   client_->SetNeedsRedrawRectOnImplThread(damage_rect);
 }
 
@@ skipping 129 matching lines @@
        id_,
        TracedValue::FromValue(AsValueWithFrame(frame).release()));
   }
 
   // Because the contents of the HUD depend on everything else in the frame, the
   // contents of its texture are updated as the last thing before the frame is
   // drawn.
   if (active_tree_->hud_layer()) {
     TRACE_EVENT0("cc", "DrawLayers.UpdateHudTexture");
     active_tree_->hud_layer()->UpdateHudTexture(
-        GetDrawMode(output_surface_.get()), resource_provider_.get());
+        GetDrawMode(resourceless_software_draw_, output_surface_.get()),

[danakj, 2014/07/09 17:21:07]

can you move this GetDrawMode up above the if statement, and use the draw_mode
below instead of resourceless_software_draw_?

[boliu, 2014/07/09 20:59:50]

Done.

+        resource_provider_.get());
   }
 
-  if (output_surface_->ForcedDrawToSoftwareDevice()) {
+  if (resourceless_software_draw_) {
     bool disable_picture_quad_image_filtering =
         IsCurrentlyScrolling() || needs_animate_layers();
 
     scoped_ptr<SoftwareRenderer> temp_software_renderer =
         SoftwareRenderer::Create(this, &settings_, output_surface_.get(), NULL);
     temp_software_renderer->DrawFrame(&frame->render_passes,
                                       device_scale_factor_,
                                       DeviceViewport(),
                                       DeviceClip(),
                                       disable_picture_quad_image_filtering);
@@ skipping 1673 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