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

Unified Diff: components/html_viewer/html_frame.cc

Issue 1281663002: Mandoline: Allow submitting CompositorFrames directly to mojo::Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 5 years, 4 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: components/html_viewer/html_frame.cc
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc
index a2349453ee200c7d2f578a62cdface532fac893c..98f4cc9b17699535524d4d1ba0445bc1b52b2b32 100644
--- a/components/html_viewer/html_frame.cc
+++ b/components/html_viewer/html_frame.cc
@@ -592,10 +592,10 @@ void HTMLFrame::didChangeContents() {
}
void HTMLFrame::initializeLayerTreeView() {
- mojo::URLRequestPtr request(mojo::URLRequest::New());
- request->url = mojo::String::From("mojo:view_manager");
- mojo::SurfacePtr surface;
- GetLocalRootApp()->ConnectToService(request.Pass(), &surface);
+ DCHECK(view());
+
+ mojo::CompositorFrameReceiverPtr receiver;
+ view()->RequestCompositorFrameReceiver(GetProxy(&receiver));
mojo::URLRequestPtr request2(mojo::URLRequest::New());
request2->url = mojo::String::From("mojo:view_manager");
@@ -605,7 +605,7 @@ void HTMLFrame::initializeLayerTreeView() {
global_state()->compositor_thread(),
global_state()->gpu_memory_buffer_manager(),
global_state()->raster_thread_helper()->task_graph_runner(),
- surface.Pass(), gpu_service.Pass()));
+ receiver.Pass(), gpu_service.Pass()));
}
blink::WebLayerTreeView* HTMLFrame::layerTreeView() {

Powered by Google App Engine
This is Rietveld 408576698