Getting rid of DelegatedFrameData

content/browser/renderer_host/render_widget_host_view_aura.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_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 889 matching lines @@
   legacy_window_destroyed_ = true;
 }
 #endif
 
 void RenderWidgetHostViewAura::OnSwapCompositorFrame(
     uint32_t compositor_frame_sink_id,
     cc::CompositorFrame frame) {
   TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame");
 
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
-  if (!frame.delegated_frame_data)
-    return;
 
   cc::Selection<gfx::SelectionBound> selection = frame.metadata.selection;
   if (IsUseZoomForDSFEnabled()) {
     float viewportToDIPScale = 1.0f / current_device_scale_factor_;
     gfx::PointF start_edge_top = selection.start.edge_top();
     gfx::PointF start_edge_bottom = selection.start.edge_bottom();
     gfx::PointF end_edge_top = selection.end.edge_top();
     gfx::PointF end_edge_bottom = selection.end.edge_bottom();
 
     start_edge_top.Scale(viewportToDIPScale);
     start_edge_bottom.Scale(viewportToDIPScale);
     end_edge_top.Scale(viewportToDIPScale);
     end_edge_bottom.Scale(viewportToDIPScale);
 
     selection.start.SetEdge(start_edge_top, start_edge_bottom);
     selection.end.SetEdge(end_edge_top, end_edge_bottom);
   }
 
-  delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id,
-                                            std::move(frame));
+  if (!frame.render_pass_list.empty())

[danakj, 2016/10/28 22:02:54]

{} for multi-line blocks

but before the selection would not be updated if the frame was null/empty, now
it will be. i don't think you want to change behaviour like that in the middle
of this large CL, it increases its riskiness by a lot and having to deal with
reverts of things like this is a huge pain. I think you should early out above
where the old code did.

+    delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id,
+                                              std::move(frame));
   SelectionUpdated(selection.is_editable, selection.is_empty_text_form_control,
                    selection.start, selection.end);
 }
 
 void RenderWidgetHostViewAura::ClearCompositorFrame() {
   delegated_frame_host_->ClearDelegatedFrame();
 }
 
 void RenderWidgetHostViewAura::DidStopFlinging() {
   selection_controller_client_->OnScrollCompleted();
@@ skipping 1438 matching lines @@
 
 void RenderWidgetHostViewAura::SetPopupChild(
     RenderWidgetHostViewAura* popup_child_host_view) {
   popup_child_host_view_ = popup_child_host_view;
   event_handler_->SetPopupChild(
       popup_child_host_view,
       popup_child_host_view ? popup_child_host_view->event_handler() : nullptr);
 }
 
 }  // namespace content