Index: components/html_viewer/html_frame.cc |
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc |
index 0d6c94898aed4cb181dcf4c32aeeb2c8881e7872..c5c9244160b43a162f4dd3351f105e7a6b4b37ab 100644 |
--- a/components/html_viewer/html_frame.cc |
+++ b/components/html_viewer/html_frame.cc |
@@ -599,10 +599,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)); |
rjkroege
2015/08/19 23:45:44
This mojo GetProxy name overlaps badly with the cc
Fady Samuel
2015/08/20 16:22:44
Acknowledged.
rjkroege
2015/08/21 18:54:45
perhaps you could do mojo::GetProxy for clarity?
Fady Samuel
2015/08/21 21:31:10
Done.
|
mojo::URLRequestPtr request2(mojo::URLRequest::New()); |
request2->url = mojo::String::From("mojo:view_manager"); |
@@ -612,7 +612,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() { |