DialogSurfaceManager implementation.

media/base/android/dialog_surface_manager.cc

Index: media/base/android/dialog_surface_manager.cc
diff --git a/media/base/android/dialog_surface_manager.cc b/media/base/android/dialog_surface_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..10d7678f077dcf480de4598a0e991d10c333b85b
--- /dev/null
+++ b/media/base/android/dialog_surface_manager.cc
@@ -0,0 +1,85 @@
+// 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 "media/base/android/dialog_surface_manager.h"
+
+#include <algorithm>
+#include <limits>
+#include <memory>
+#include <utility>
+
+#include "base/android/build_info.h"
+#include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
+#include "base/logging.h"
+#include "base/numerics/safe_conversions.h"
+#include "base/strings/string_util.h"
+#include "gpu/ipc/common/android/dialog_surface_lookup.h"
+#include "jni/DialogSurfaceManagerWrapper_jni.h"
+#include "media/base/android/dialog_surface_callback.h"
+#include "media/base/bit_reader.h"
+#include "media/base/decrypt_config.h"
+
+using base::android::AttachCurrentThread;
+using base::android::ConvertJavaStringToUTF8;

[boliu, 2017/01/04 01:48:44]

some of these are not needed, which probably means some includes are not needed
as well, I didn't check all the files though..

[liberato (no reviews please), 2017/01/11 22:17:57]

thought i cleaned these up.  sorry about that.

done, and elsewhere.

+using base::android::ConvertUTF8ToJavaString;
+using base::android::JavaIntArrayToIntVector;
+using base::android::ScopedJavaGlobalRef;
+using base::android::ScopedJavaLocalRef;
+
+namespace media {
+
+static base::LazyInstance<DialogSurfaceManager>::Leaky g_surface_manager =
+    LAZY_INSTANCE_INITIALIZER;
+
+DialogSurfaceManager* DialogSurfaceManager::Get() {
+  return g_surface_manager.Pointer();
+}
+
+DialogSurfaceManager::DialogSurfaceManager() {
+  JNIEnv* env = AttachCurrentThread();
+  CHECK(env);
+
+  // Get the surface manager from the browser.
+  // This can, in principle, be run in the gpu process if we send the window
+  // token from the browser.  See https://codereview.chromium.org/1967553002 .
+  // Either way, we end up with an IDialogSurfaceManager here, and we don't
+  // care whether it's local or remote.
+  ScopedJavaLocalRef<jobject> unwrapped_manager(
+      gpu::DialogSurfaceLookup::GetInstance()->GetDialogSurfaceManager());
+
+  // Wrap the manager for access from native code.
+  j_wrapped_manager_.Reset(
+      Java_DialogSurfaceManagerWrapper_wrap(env, unwrapped_manager.obj()));
+}
+
+DialogSurfaceManager::~DialogSurfaceManager() {}
+
+std::unique_ptr<DialogSurface> DialogSurfaceManager::CreateSurface(
+    base::ProcessHandle pid,
+    int frame_id,
+    const Config& config,
+    const DialogSurface::Callback& callback) {
+  JNIEnv* env = AttachCurrentThread();
+  CHECK(env);
+
+  std::unique_ptr<DialogSurfaceCallback> wrapped_callback(
+      new DialogSurfaceCallback(callback));
+
+  ScopedJavaGlobalRef<jobject> result(
+      Java_DialogSurfaceManagerWrapper_createSurface(
+          env, j_wrapped_manager_.obj(), pid, frame_id, wrapped_callback->obj(),
+          config.rect.x(), config.rect.y(), config.rect.width(),
+          config.rect.height()));
+
+  std::unique_ptr<DialogSurface> surface;
+  if (result.obj() != nullptr) {

[boliu, 2017/01/04 01:48:44]

nit: !result.is_null() reads better..

[liberato (no reviews please), 2017/01/11 22:17:57]

Done.

+    surface.reset(new DialogSurface(result, std::move(wrapped_callback)));
+  }
+
+  return surface;
+}
+
+}  // namespace media