Add ScopedSurfaceRequestManager

content/browser/android/scoped_surface_request_manager.cc

Index: content/browser/android/scoped_surface_request_manager.cc
diff --git a/content/browser/android/scoped_surface_request_manager.cc b/content/browser/android/scoped_surface_request_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c826a816f888aecc7360516f8a4df338858120e5
--- /dev/null
+++ b/content/browser/android/scoped_surface_request_manager.cc
@@ -0,0 +1,90 @@
+// 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"
+
+#include "content/public/browser/browser_thread.h"
+
+namespace content {
+
+// static
+ScopedSurfaceRequestManager* ScopedSurfaceRequestManager::GetInstance() {
+  return base::Singleton<
+      ScopedSurfaceRequestManager,
+      base::LeakySingletonTraits<ScopedSurfaceRequestManager>>::get();
+}
+
+base::UnguessableToken
+ScopedSurfaceRequestManager::RegisterScopedSurfaceRequest(
+    ScopedSurfaceRequestCB request_cb) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(!request_cb.is_null());
+
+  base::UnguessableToken request_token = base::UnguessableToken::Create();
+
+  DCHECK(!request_callbacks_.count(request_token));
+  request_callbacks_.insert(std::make_pair(request_token, request_cb));
+
+  return request_token;
+}
+
+void ScopedSurfaceRequestManager::UnregisterScopedSurfaceRequest(
+    const base::UnguessableToken& request_token) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  GetAndUnregisterInternal(request_token);
+}
+
+ScopedSurfaceRequestManager::ScopedSurfaceRequestCB
+ScopedSurfaceRequestManager::GetAndUnregisterInternal(
+    const base::UnguessableToken& request_token) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(!request_token.is_empty());
+
+  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB request;
+
+  auto it = request_callbacks_.find(request_token);
+  if (it != request_callbacks_.end()) {
+    request = it->second;
+    request_callbacks_.erase(it);
+  }
+
+  return request;
+}
+
+void ScopedSurfaceRequestManager::ForwardSurfaceTextureForSurfaceRequest(
+    const base::UnguessableToken& request_token,
+    const gl::SurfaceTexture* surface_texture) {
+  FulfillScopedSurfaceRequest(request_token,
+                              gl::ScopedJavaSurface(surface_texture));
+}
+
+void ScopedSurfaceRequestManager::FulfillScopedSurfaceRequest(
+    const base::UnguessableToken& request_token,
+    gl::ScopedJavaSurface surface) {
+  // base::Unretained is safe because the lifetime of this object is tied to
+  // the lifetime of the browser process.
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&ScopedSurfaceRequestManager::CompleteRequestOnUiThread,
+                 base::Unretained(this), request_token,
+                 base::Passed(std::move(surface))));

[dcheng, 2016/09/20 06:50:35]

base::Passed(&surface) is shorthand for this.

[tguilbert, 2016/09/20 20:59:19]

TIL TY!

+}
+
+void ScopedSurfaceRequestManager::CompleteRequestOnUiThread(

[tguilbert, 2016/09/20 03:08:40]

Style question because I didn't find any official guidance on 2 letter acronyms:
CompleteRequestOnUIThread or
CompleteRequestOnUiThread?

[dcheng, 2016/09/20 06:50:35]

The consensus is that the style guide states this should be Ui.

[tguilbert, 2016/09/20 20:59:19]

Ok, thanks.

+    const base::UnguessableToken& request_token,
+    gl::ScopedJavaSurface surface) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB request =
+      GetAndUnregisterInternal(request_token);
+
+  if (!request.is_null())
+    request.Run(std::move(surface));
+}
+
+ScopedSurfaceRequestManager::ScopedSurfaceRequestManager() {}
+
+ScopedSurfaceRequestManager::~ScopedSurfaceRequestManager() {}
+
+}  // namespace content