Add ScopedSurfaceRequestManager

content/browser/android/scoped_surface_request_manager.cc

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/android/scoped_surface_request_manager.h"
+
+namespace content {
+
+// static
+ScopedSurfaceRequestManager* ScopedSurfaceRequestManager::GetInstance() {
+  return base::Singleton<
+      ScopedSurfaceRequestManager,
+      base::LeakySingletonTraits<ScopedSurfaceRequestManager>>::get();
+}
+
+void ScopedSurfaceRequestManager::RegisterScopedSurfaceRequest(
+    uint64_t request_id,
+    ScopedSurfaceRequestCB request_cb) {
+  base::AutoLock lock(lock_);
+
+  DCHECK(!request_callbacks_.count(request_id));
+  request_callbacks_.insert(std::make_pair(request_id, request_cb));

[watk, 2016/08/29 19:42:26]

Seems like the request token should be generated here. It would also be a good
place to make it clear that the token is used for authentication.

[liberato (no reviews please), 2016/08/29 21:10:19]

should also check with chrome security if int64 is sufficient.

[tguilbert, 2016/08/30 22:53:09]

Done @ generating the token here. I will follow up with chrome security. I know
int64 is used here at least:
https://cs.chromium.org/chromium/src/cc/surfaces/surface_id.h?q=nonce&sq=pack...

+}
+
+ScopedSurfaceRequestManager::ScopedSurfaceRequestCB
+ScopedSurfaceRequestManager::GetAndUnregisterScopedSurfaceRequest(
+    uint64_t request_id) {
+  base::AutoLock lock(lock_);
+
+  return GetAndUnregisterInternal(request_id);
+}
+
+ScopedSurfaceRequestManager::ScopedSurfaceRequestCB
+ScopedSurfaceRequestManager::GetAndUnregisterInternal(uint64_t request_id) {
+  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB request;
+
+  auto it = request_callbacks_.find(request_id);
+
+  if (it != request_callbacks_.end()) {
+    request = it->second;
+    request_callbacks_.erase(it);
+  }
+
+  return request;
+}
+
+void ScopedSurfaceRequestManager::FulfillScopedSurfaceRequest(
+    uint64_t request_id,
+    gl::SurfaceTexture* surface_texture) {
+  base::AutoLock lock(lock_);
+
+  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB request =
+      GetAndUnregisterInternal(request_id);
+
+  if (!request.is_null()) {
+    gl::ScopedJavaSurface surface(surface_texture);
+    request.Run(std::move(surface));
+  }
+}
+
+ScopedSurfaceRequestManager::ScopedSurfaceRequestManager() {}
+
+ScopedSurfaceRequestManager::~ScopedSurfaceRequestManager() {}
+
+}  // namespace content