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

Unified Diff: mojo/services/html_viewer/html_document.cc

Issue 869343004: Remove use of mojo.SurfacesService interface in html_viewer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « mojo/cc/output_surface_mojo.cc ('k') | mojo/services/html_viewer/weblayertreeview_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/html_document.cc
diff --git a/mojo/services/html_viewer/html_document.cc b/mojo/services/html_viewer/html_document.cc
index 6bd33a186934aa0e66638c8ddf2b0ebd3bf8e8b0..8375a709569afba02a7e24dc470fcf3e74538b95 100644
--- a/mojo/services/html_viewer/html_document.cc
+++ b/mojo/services/html_viewer/html_document.cc
@@ -178,8 +178,8 @@ void HTMLDocument::initializeLayerTreeView() {
ServiceProviderPtr surfaces_service_provider;
shell_->ConnectToApplication("mojo:surfaces_service",
GetProxy(&surfaces_service_provider), nullptr);
- mojo::SurfacesServicePtr surfaces_service;
- ConnectToService(surfaces_service_provider.get(), &surfaces_service);
+ mojo::SurfacePtr surface;
+ ConnectToService(surfaces_service_provider.get(), &surface);
ServiceProviderPtr gpu_service_provider;
// TODO(jamesr): Should be mojo:gpu_service
@@ -188,7 +188,7 @@ void HTMLDocument::initializeLayerTreeView() {
mojo::GpuPtr gpu_service;
ConnectToService(gpu_service_provider.get(), &gpu_service);
web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
- compositor_thread_, surfaces_service.Pass(), gpu_service.Pass()));
+ compositor_thread_, surface.Pass(), gpu_service.Pass()));
}
blink::WebLayerTreeView* HTMLDocument::layerTreeView() {
« no previous file with comments | « mojo/cc/output_surface_mojo.cc ('k') | mojo/services/html_viewer/weblayertreeview_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698