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

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: Yet anther rebase (YAR!!!) 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 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() {

Powered by Google App Engine
This is Rietveld 408576698