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

Unified Diff: mojo/cc/output_surface_mojo.cc

Issue 877993004: Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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.h ('k') | third_party/mojo/src/mojo/edk/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/cc/output_surface_mojo.cc
diff --git a/mojo/cc/output_surface_mojo.cc b/mojo/cc/output_surface_mojo.cc
index c489280d5f94a9555ccee94dde6b620008c68a5b..fff13806450aed4fe22e1f96bcf77bec6652f046 100644
--- a/mojo/cc/output_surface_mojo.cc
+++ b/mojo/cc/output_surface_mojo.cc
@@ -4,7 +4,6 @@
#include "mojo/cc/output_surface_mojo.h"
-#include "base/bind.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/output_surface_client.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
@@ -21,8 +20,6 @@ OutputSurfaceMojo::OutputSurfaceMojo(
surface_(surface.Pass()),
id_namespace_(0u),
local_id_(0u) {
- surface_->GetIdNamespace(
- base::Bind(&OutputSurfaceMojo::SetIdNamespace, base::Unretained(this)));
capabilities_.delegated_rendering = true;
capabilities_.max_frames_pending = 1;
}
@@ -39,7 +36,11 @@ void OutputSurfaceMojo::SetIdNamespace(uint32_t id_namespace) {
}
}
+void OutputSurfaceMojo::ReturnResources(Array<ReturnedResourcePtr> resources) {
+}
+
bool OutputSurfaceMojo::BindToClient(cc::OutputSurfaceClient* client) {
+ surface_.set_client(this);
return cc::OutputSurface::BindToClient(client);
}
« no previous file with comments | « mojo/cc/output_surface_mojo.h ('k') | third_party/mojo/src/mojo/edk/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698