Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(936)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2449853004: Getting rid of DelegatedFrameData (Closed)
Patch Set: Compile error + auro widget Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index b5ed661870678988ded999fc0bef7927db7e2181..75b36cd26ea78e6081b24bcb92e05202cea6e255 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -907,8 +907,6 @@ void RenderWidgetHostViewAura::OnSwapCompositorFrame(
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()) {
@@ -927,8 +925,9 @@ void RenderWidgetHostViewAura::OnSwapCompositorFrame(
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
+ 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);
}

Powered by Google App Engine
This is Rietveld 408576698