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

Unified Diff: components/surfaces/display_impl.cc

Issue 1138293002: core_services: Add mojo:surfaces_service to core_services. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/surfaces/display_impl.cc
diff --git a/components/surfaces/display_impl.cc b/components/surfaces/display_impl.cc
index 15319159a8b7d293b33ca8653f3c3fb84587c5d1..6306438632189eb5ce24c13ccd9a5d5975f791a5 100644
--- a/components/surfaces/display_impl.cc
+++ b/components/surfaces/display_impl.cc
@@ -6,7 +6,7 @@
#include "cc/output/compositor_frame.h"
#include "cc/surfaces/display.h"
-#include "components/surfaces/context_provider_mojo.h"
+#include "components/surfaces/surfaces_context_provider.h"
#include "components/surfaces/surfaces_output_surface.h"
#include "components/surfaces/surfaces_scheduler.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
@@ -46,8 +46,8 @@ void DisplayImpl::OnContextCreated(mojo::CommandBufferPtr gles2_client) {
cc::RendererSettings settings;
display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));
scheduler_->AddDisplay(display_.get());
- display_->Initialize(make_scoped_ptr(new mojo::DirectOutputSurface(
- new mojo::ContextProviderMojo(gles2_client.PassMessagePipe()))));
+ display_->Initialize(make_scoped_ptr(new surfaces::DirectOutputSurface(
+ new surfaces::SurfacesContextProvider(gles2_client.PassMessagePipe()))));
factory_.Create(cc_id_);
display_->SetSurfaceId(cc_id_, 1.f);

Powered by Google App Engine
This is Rietveld 408576698