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

Unified Diff: android_webview/browser/surfaces_instance.cc

Issue 2449853004: Getting rid of DelegatedFrameData (Closed)
Patch Set: IsEmpty + rebase 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: android_webview/browser/surfaces_instance.cc
diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
index 02788b2618ab97f2df2b66cb59955fa22fc01210..f84809de8ccc7b9b6af8b7b03ee2adc190e0b260 100644
--- a/android_webview/browser/surfaces_instance.cc
+++ b/android_webview/browser/surfaces_instance.cc
@@ -133,11 +133,8 @@ void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_bounds),
gfx::Rect(quad_state->quad_layer_bounds), child_id);
- std::unique_ptr<cc::DelegatedFrameData> delegated_frame(
- new cc::DelegatedFrameData);
- delegated_frame->render_pass_list.push_back(std::move(render_pass));
cc::CompositorFrame frame;
- frame.delegated_frame_data = std::move(delegated_frame);
+ frame.render_pass_list.push_back(std::move(render_pass));
frame.metadata.referenced_surfaces = child_ids_;
if (root_id_.is_null()) {
@@ -170,8 +167,6 @@ void SurfacesInstance::RemoveChildId(const cc::SurfaceId& child_id) {
void SurfacesInstance::SetEmptyRootFrame() {
cc::CompositorFrame empty_frame;
- empty_frame.delegated_frame_data =
- base::WrapUnique(new cc::DelegatedFrameData);
empty_frame.metadata.referenced_surfaces = child_ids_;
surface_factory_->SubmitCompositorFrame(root_id_, std::move(empty_frame),
cc::SurfaceFactory::DrawCallback());

Powered by Google App Engine
This is Rietveld 408576698