Mus experiment in content shell on Android.

ui/platform_window/android/platform_window_android.cc

 // Copyright 2015 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 "ui/platform_window/android/platform_window_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
+#include "base/bind.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "gpu/ipc/common/gpu_surface_tracker.h"
 #include "jni/PlatformWindowAndroid_jni.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace ui {
@@ skipping 61 matching lines @@
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jsurface,
     float device_pixel_ratio) {
   // Note: This ensures that any local references used by
   // ANativeWindow_fromSurface are released immediately. This is needed as a
   // workaround for https://code.google.com/p/android/issues/detail?id=68174
   {
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
     window_ = ANativeWindow_fromSurface(env, jsurface);
   }
-  delegate_->OnAcceleratedWidgetAvailable(window_, device_pixel_ratio);
+
+  gpu::SurfaceHandle surface_handle =
+      gpu::GpuSurfaceTracker::GetInstance()->AddSurfaceForNativeWidget(window_);
+
+  // Post the notification to the delegate to ensure pending initializations
+  // for the surface have a chance to run.
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE,
+      base::Bind(&PlatformWindowAndroid::NotifyDelegateSurfaceCreated,
+                 weak_factory_.GetWeakPtr(), surface_handle,
+                 device_pixel_ratio));
 }
 
 void PlatformWindowAndroid::SurfaceDestroyed(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj) {
   DCHECK(window_);
   delegate_->OnAcceleratedWidgetDestroyed();
   ReleaseWindow();
 }
 
 void PlatformWindowAndroid::SurfaceSetSize(JNIEnv* env,
@@ skipping 45 matching lines @@
     delegate_->DispatchEvent(&char_event);
   }
   return true;
 }
 
 void PlatformWindowAndroid::ReleaseWindow() {
   ANativeWindow_release(window_);
   window_ = NULL;
 }
 
+void PlatformWindowAndroid::NotifyDelegateSurfaceCreated(
+    gpu::SurfaceHandle surface_handle,
+    float device_pixel_ratio) {
+  delegate_->OnAcceleratedWidgetAvailable(surface_handle, device_pixel_ratio);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformWindowAndroid, PlatformWindow implementation:
 
 void PlatformWindowAndroid::Show() {
   if (!java_platform_window_android_.is_empty())
     return;
+
   JNIEnv* env = base::android::AttachCurrentThread();
   java_platform_window_android_ = JavaObjectWeakGlobalRef(
-      env, Java_PlatformWindowAndroid_createForActivity(
-               env, base::android::GetApplicationContext(),
+      env, Java_PlatformWindowAndroid_createForCurrentActivity(
+               env,
                reinterpret_cast<jlong>(this),
-               reinterpret_cast<jlong>(&platform_ime_controller_)).obj());
+               reinterpret_cast<jlong>(&platform_ime_controller_))
+               .obj());
 }
 
 void PlatformWindowAndroid::Hide() {
   // Nothing to do. View is always visible.
 }
 
 void PlatformWindowAndroid::Close() {
   delegate_->OnCloseRequest();
 }
 
@@ skipping 43 matching lines @@
 
 void PlatformWindowAndroid::ConfineCursorToBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 PlatformImeController* PlatformWindowAndroid::GetPlatformImeController() {
   return &platform_ime_controller_;
 }
 
 }  // namespace ui