Android: Remove some dead code

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 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 "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 307 matching lines @@
       last_output_surface_id_(kUndefinedOutputSurfaceId),
       gesture_provider_(ui::GetGestureProviderConfig(
                             ui::GestureProviderConfigType::CURRENT_PLATFORM),
                         this),
       stylus_text_selector_(this),
       using_browser_compositor_(CompositorImpl::IsInitialized()),
       frame_evictor_(new DelegatedFrameEvictor(this)),
       locks_on_frame_count_(0),
       observing_root_window_(false),
       weak_ptr_factory_(this) {
   if (CompositorImpl::GetSurfaceManager())

[danakj, 2016/07/01 23:15:37]

should this be a DCHECK or go away?

[no sievers, 2016/07/01 23:29:06]

I removed it in ps1 but then remembered there is WebView :)

     id_allocator_ = CompositorImpl::CreateSurfaceIdAllocator();
   host_->SetView(this);
   SetContentViewCore(content_view_core);
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
   if (content_view_core_)
     content_view_core_->RemoveObserver(this);
   SetContentViewCore(NULL);
   DCHECK(ack_callbacks_.empty());
@@ skipping 84 matching lines @@
   float device_scale_factor = display.device_scale_factor();
   DCHECK_GT(device_scale_factor, 0);
   gfx::Size dst_size(
       gfx::ScaleToCeiledSize(src_subrect.size(), scale / device_scale_factor));
   src_subrect = gfx::ConvertRectToDIP(device_scale_factor, src_subrect);
 
   CopyFromCompositingSurface(src_subrect, dst_size, result_callback,
                              preferred_color_type);
 }
 
-scoped_refptr<cc::Layer> RenderWidgetHostViewAndroid::CreateDelegatedLayer()
+scoped_refptr<cc::Layer> RenderWidgetHostViewAndroid::CreateSurfaceLayer()

[danakj, 2016/07/01 23:15:37]

perhaps this return type can be SurfaceLayer?

[no sievers, 2016/07/01 23:29:06]

Done.

     const {
   scoped_refptr<cc::Layer> delegated_layer;

[danakj, 2016/07/01 23:15:37]

this variable can go 

[no sievers, 2016/07/01 23:29:06]

Done.

   DCHECK(!surface_id_.is_null());
   cc::SurfaceManager* manager = CompositorImpl::GetSurfaceManager();
   DCHECK(manager);
   // manager must outlive compositors using it.
   scoped_refptr<cc::SurfaceLayer> surface_layer = cc::SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, base::Unretained(manager)),
       base::Bind(&RequireCallback, base::Unretained(manager)));
   surface_layer->SetSurfaceId(surface_id_, 1.f, texture_size_in_layer_);
   delegated_layer = surface_layer;
   delegated_layer->SetBounds(texture_size_in_layer_);
@@ skipping 556 matching lines @@
   if (surface_id_.is_null() ||
       texture_size_in_layer_ != current_surface_size_ ||
       location_bar_content_translation_ !=
           frame.metadata.location_bar_content_translation ||
       current_viewport_selection_ != frame.metadata.selection) {
     RemoveLayers();
     if (!surface_id_.is_null())
       surface_factory_->Destroy(surface_id_);
     surface_id_ = id_allocator_->GenerateId();
     surface_factory_->Create(surface_id_);
-    layer_ = CreateDelegatedLayer();
+    layer_ = CreateSurfaceLayer();
 
     DCHECK(layer_);
 
     current_surface_size_ = texture_size_in_layer_;
     location_bar_content_translation_ =
         frame.metadata.location_bar_content_translation;
     current_viewport_selection_ = frame.metadata.selection;
     AttachLayers();
   }
 
   cc::SurfaceFactory::DrawCallback ack_callback =
       base::Bind(&RenderWidgetHostViewAndroid::RunAckCallbacks,
                  weak_ptr_factory_.GetWeakPtr());
   surface_factory_->SubmitCompositorFrame(surface_id_, std::move(frame),
                                           ack_callback);
 }
 
-void RenderWidgetHostViewAndroid::SwapDelegatedFrame(
+void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame(
     uint32_t output_surface_id,
     cc::CompositorFrame frame) {
+  last_scroll_offset_ = frame.metadata.root_scroll_offset;
+  DCHECK(frame.delegated_frame_data);
+  DCHECK(CompositorImpl::GetSurfaceManager());

[danakj, 2016/07/01 23:15:37]

Then does this add value if we DCHECK in constructor?

+
+  if (locks_on_frame_count_ > 0) {
+    DCHECK(HasValidFrame());
+    RetainFrame(output_surface_id, std::move(frame));
+    return;
+  }
+
+  DCHECK(!frame.delegated_frame_data->render_pass_list.empty());
+
+  cc::RenderPass* root_pass =
+      frame.delegated_frame_data->render_pass_list.back().get();
+  texture_size_in_layer_ = root_pass->output_rect.size();
+
+  cc::CompositorFrameMetadata metadata = frame.metadata.Clone();
+
   CheckOutputSurfaceChanged(output_surface_id);
   bool has_content = !texture_size_in_layer_.IsEmpty();
 
   base::Closure ack_callback =
       base::Bind(&RenderWidgetHostViewAndroid::SendDelegatedFrameAck,
                  weak_ptr_factory_.GetWeakPtr(),
                  output_surface_id);
 
   ack_callbacks_.push(ack_callback);
 
   if (!has_content) {
     DestroyDelegatedContent();
   } else {
     SubmitCompositorFrame(std::move(frame));
-  }
-
-  if (layer_.get()) {
     layer_->SetIsDrawable(true);
     layer_->SetContentsOpaque(true);
     layer_->SetBounds(texture_size_in_layer_);
   }
 
   if (host_->is_hidden())
     RunAckCallbacks(cc::SurfaceDrawStatus::DRAW_SKIPPED);
-}
-
-void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame(
-    uint32_t output_surface_id,
-    cc::CompositorFrame frame) {
-  last_scroll_offset_ = frame.metadata.root_scroll_offset;
-  if (!frame.delegated_frame_data) {
-    LOG(ERROR) << "Non-delegated renderer path no longer supported";
-    return;
-  }
-
-  if (locks_on_frame_count_ > 0) {
-    DCHECK(HasValidFrame());
-    RetainFrame(output_surface_id, std::move(frame));
-    return;
-  }
-
-  if (!CompositorImpl::GetSurfaceManager() && layer_.get() &&
-      layer_->layer_tree_host()) {
-    for (size_t i = 0; i < frame.metadata.latency_info.size(); i++) {
-      std::unique_ptr<cc::SwapPromise> swap_promise(
-          new cc::LatencyInfoSwapPromise(frame.metadata.latency_info[i]));
-      layer_->layer_tree_host()->QueueSwapPromise(std::move(swap_promise));
-    }
-  }
-
-  DCHECK(!frame.delegated_frame_data->render_pass_list.empty());
-
-  cc::RenderPass* root_pass =
-      frame.delegated_frame_data->render_pass_list.back().get();
-  texture_size_in_layer_ = root_pass->output_rect.size();
-
-  cc::CompositorFrameMetadata metadata = frame.metadata.Clone();
-
-  SwapDelegatedFrame(output_surface_id, std::move(frame));
   frame_evictor_->SwappedFrame(!host_->is_hidden());
 
   // As the metadata update may trigger view invalidation, always call it after
   // any potential compositor scheduling.
   OnFrameMetadataUpdated(std::move(metadata));
 }
 
 void RenderWidgetHostViewAndroid::OnSwapCompositorFrame(
     uint32_t output_surface_id,
     cc::CompositorFrame frame) {
@@ skipping 909 matching lines @@
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
 }  // namespace content