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

Unified Diff: services/surfaces/surfaces_impl.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « sandbox/linux/tests/unit_tests.cc ('k') | skia/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/surfaces/surfaces_impl.cc
diff --git a/services/surfaces/surfaces_impl.cc b/services/surfaces/surfaces_impl.cc
index 9cbe6dd38a4049edcdb04e76100c6c139af75190..7387f9ce2e66774a87b371e3dad1550a99744d74 100644
--- a/services/surfaces/surfaces_impl.cc
+++ b/services/surfaces/surfaces_impl.cc
@@ -44,7 +44,7 @@ void SurfacesImpl::CreateSurface(SurfaceIdPtr id, SizePtr size) {
NOTREACHED();
return;
}
- factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>());
+ factory_.Create(id.To<cc::SurfaceId>());
}
void SurfacesImpl::SubmitFrame(SurfaceIdPtr id,
@@ -97,8 +97,9 @@ void SurfacesImpl::CreateGLES2BoundSurface(
display_->Initialize(make_scoped_ptr(new DirectOutputSurface(
new ContextProviderMojo(command_buffer_handle_.Pass()))));
}
- factory_.Create(cc_id, size.To<gfx::Size>());
- display_->Resize(cc_id, size.To<gfx::Size>(), 1.f);
+ factory_.Create(cc_id);
+ display_->SetSurfaceId(cc_id, 1.f);
+ display_->Resize(size.To<gfx::Size>());
parameter_listeners_.AddBinding(this, listener_request.Pass());
}
« no previous file with comments | « sandbox/linux/tests/unit_tests.cc ('k') | skia/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698