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

Unified Diff: android_webview/browser/test/rendering_test.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/test/rendering_test.cc
diff --git a/android_webview/browser/test/rendering_test.cc b/android_webview/browser/test/rendering_test.cc
index 5a941417099ec6e19eb10bf61ef8a7cfa12d0361..248b914703ee445148dca34ca8d603973eab38e8 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -112,13 +112,11 @@ content::SynchronousCompositor* RenderingTest::ActiveCompositor() const {
std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() {
std::unique_ptr<cc::CompositorFrame> compositor_frame(
new cc::CompositorFrame);
- std::unique_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData);
std::unique_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create());
gfx::Rect viewport(browser_view_renderer_->size());
root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport,
gfx::Transform());
- frame->render_pass_list.push_back(std::move(root_pass));
- compositor_frame->delegated_frame_data = std::move(frame);
+ compositor_frame->render_pass_list.push_back(std::move(root_pass));
return compositor_frame;
}
@@ -127,7 +125,7 @@ std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructFrame(
std::unique_ptr<cc::CompositorFrame> compositor_frame(ConstructEmptyFrame());
cc::TransferableResource resource;
resource.id = resource_id;
- compositor_frame->delegated_frame_data->resource_list.push_back(resource);
+ compositor_frame->resource_list.push_back(resource);
return compositor_frame;
}

Powered by Google App Engine
This is Rietveld 408576698