diff --git a/sky/shell/gpu/direct/rasterizer_direct.cc b/sky/shell/gpu/direct/rasterizer_direct.cc
index 1e66e006b25f6bc208c212335d5a791e8850be70..d4ab6c58ee136e7f2b8cd66a6c7b0f21251c5af5 100644
--- a/sky/shell/gpu/direct/rasterizer_direct.cc
+++ b/sky/shell/gpu/direct/rasterizer_direct.cc
@@ -52,7 +52,8 @@ void RasterizerDirect::ConnectToRasterizer(
   Shell::Shared().AddRasterizer(GetWeakRasterizerPtr());
 }
 
-void RasterizerDirect::OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) {
+void RasterizerDirect::OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
+                                                    base::WaitableEvent* did_draw) {
   gfx::SurfaceConfiguration config;
   config.stencil_bits = 8;
   surface_ = gfx::GLSurface::CreateViewGLSurface(widget, config);
@@ -66,6 +67,8 @@ void RasterizerDirect::OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widge
   glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
   glClear(GL_COLOR_BUFFER_BIT);
   surface_->SwapBuffers();
+  if (did_draw)
+    did_draw->Signal();
 }
 
 void RasterizerDirect::Draw(uint64_t layer_tree_ptr,
diff --git a/sky/shell/gpu/direct/rasterizer_direct.h b/sky/shell/gpu/direct/rasterizer_direct.h
index 07e766b7c2e87c311bcf315c327779d165e54a9b..072aa7214911fee2a693796a6cde1f711a6d5548 100644
--- a/sky/shell/gpu/direct/rasterizer_direct.h
+++ b/sky/shell/gpu/direct/rasterizer_direct.h
@@ -6,6 +6,7 @@
 #define SKY_SHELL_GPU_DIRECT_RASTERIZER_H_
 
 #include "base/memory/weak_ptr.h"
+#include "base/synchronization/waitable_event.h"
 #include "flow/compositor_context.h"
 #include "skia/ext/refptr.h"
 #include "sky/shell/gpu/direct/ganesh_canvas.h"
@@ -35,7 +36,8 @@ class RasterizerDirect : public Rasterizer {
   void ConnectToRasterizer(
       mojo::InterfaceRequest<rasterizer::Rasterizer> request) override;
 
-  void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget);
+  void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
+                                    base::WaitableEvent* did_draw);
   void OnOutputSurfaceDestroyed();
 
   flow::LayerTree* GetLastLayerTree() override;
diff --git a/sky/shell/gpu/direct/surface_notifications_direct.cc b/sky/shell/gpu/direct/surface_notifications_direct.cc
index 4974a0f2f4c9f66aa08336745bdf89f6fa2ee507..167d88eb2ea029e46067a155c85f584b867cbfc5 100644
--- a/sky/shell/gpu/direct/surface_notifications_direct.cc
+++ b/sky/shell/gpu/direct/surface_notifications_direct.cc
@@ -14,13 +14,15 @@ namespace sky {
 namespace shell {
 
 void SurfaceNotificationsDirect::NotifyCreated(
-    const PlatformView::Config& config, gfx::AcceleratedWidget widget) {
+    const PlatformView::Config& config,
+    gfx::AcceleratedWidget widget,
+    base::WaitableEvent* did_draw) {
   RasterizerDirect* rasterizer = static_cast<RasterizerDirect*>(config.rasterizer);
   config.ui_task_runner->PostTask(
       FROM_HERE, base::Bind(&UIDelegate::OnOutputSurfaceCreated,
                             config.ui_delegate,
                             base::Bind(&RasterizerDirect::OnAcceleratedWidgetAvailable,
-                                       rasterizer->GetWeakPtr(), widget)));
+                                       rasterizer->GetWeakPtr(), widget, did_draw)));
 }
 
 void SurfaceNotificationsDirect::NotifyDestroyed(
diff --git a/sky/shell/gpu/direct/surface_notifications_direct.h b/sky/shell/gpu/direct/surface_notifications_direct.h
index 1cb94bfa4b5eb6e18ebeb7972aea9b1a41be2395..d3ac169103c31b7f9468809d96121e74f6601975 100644
--- a/sky/shell/gpu/direct/surface_notifications_direct.h
+++ b/sky/shell/gpu/direct/surface_notifications_direct.h
@@ -5,6 +5,7 @@
 #ifndef SKY_SHELL_GPU_DIRECT_SURFACE_NOTIFICATIONS_DIRECT_H_
 #define SKY_SHELL_GPU_DIRECT_SURFACE_NOTIFICATIONS_DIRECT_H_
 
+#include "base/synchronization/waitable_event.h"
 #include "sky/shell/platform_view.h"
 
 namespace sky {
@@ -13,7 +14,8 @@ namespace shell {
 class SurfaceNotificationsDirect {
  public:
   static void NotifyCreated(const PlatformView::Config& config,
-                            gfx::AcceleratedWidget widget);
+                            gfx::AcceleratedWidget widget,
+                            base::WaitableEvent* did_draw);
   static void NotifyDestroyed(const PlatformView::Config& config);
 };
 
diff --git a/sky/shell/platform/android/platform_view_android.cc b/sky/shell/platform/android/platform_view_android.cc
index df1f61177783d29b66d1a009a072b20a1e2d4b61..06d52e55fd5f044c264e96b77c1a3b2d80d4ab92 100644
--- a/sky/shell/platform/android/platform_view_android.cc
+++ b/sky/shell/platform/android/platform_view_android.cc
@@ -43,7 +43,7 @@ PlatformView* PlatformView::Create(const Config& config) {
 }
 
 PlatformViewAndroid::PlatformViewAndroid(const Config& config)
-  : PlatformView(config), window_(nullptr) {
+  : PlatformView(config), window_(nullptr), did_draw_(false, false) {
 }
 
 PlatformViewAndroid::~PlatformViewAndroid() {
@@ -65,7 +65,8 @@ void PlatformViewAndroid::SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurf
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
     window_ = ANativeWindow_fromSurface(env, jsurface);
   }
-  SurfaceNotificationsDirect::NotifyCreated(config_, window_);
+  SurfaceNotificationsDirect::NotifyCreated(config_, window_, &did_draw_);
+  did_draw_.Wait();
 }
 
 void PlatformViewAndroid::SurfaceDestroyed(JNIEnv* env, jobject obj) {
diff --git a/sky/shell/platform/android/platform_view_android.h b/sky/shell/platform/android/platform_view_android.h
index 5c5cd3d4560a67c3fdc745f43df5bba47c75bd1f..ec6c046c9d468b237f13d68d865c541a556d0541 100644
--- a/sky/shell/platform/android/platform_view_android.h
+++ b/sky/shell/platform/android/platform_view_android.h
@@ -5,6 +5,7 @@
 #ifndef SKY_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
 #define SKY_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
 
+#include "base/synchronization/waitable_event.h"
 #include "sky/shell/platform_view.h"
 
 struct ANativeWindow;
@@ -36,6 +37,7 @@ class PlatformViewAndroid : public PlatformView {
   // |Detach|, which will eventually cause |~PlatformViewAndroid|.
   std::unique_ptr<ShellView> shell_view_;
   gfx::AcceleratedWidget window_;
+  base::WaitableEvent did_draw_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformViewAndroid);
 };
diff --git a/sky/shell/platform/glfw/platform_view_glfw.cc b/sky/shell/platform/glfw/platform_view_glfw.cc
index cc683b912523d94d761fa71143c98753d51f7d7d..cc0ae00470072a7ffddb6864bce5d916e2c71c58 100644
--- a/sky/shell/platform/glfw/platform_view_glfw.cc
+++ b/sky/shell/platform/glfw/platform_view_glfw.cc
@@ -21,7 +21,7 @@ PlatformViewGLFW::~PlatformViewGLFW() {}
 void PlatformViewGLFW::SurfaceCreated(gfx::AcceleratedWidget widget) {
   DCHECK(window_ == gfx::kNullAcceleratedWidget);
   window_ = widget;
-  SurfaceNotificationsDirect::NotifyCreated(config_, window_);
+  SurfaceNotificationsDirect::NotifyCreated(config_, window_, nullptr);
 }
 
 void PlatformViewGLFW::SurfaceDestroyed() {
diff --git a/sky/shell/platform/mac/platform_view_mac.mm b/sky/shell/platform/mac/platform_view_mac.mm
index dda5db89eb488341ab9c0a7fdd3a053297fed4bc..97229b4ce27df3bac4f42ec4183d0b3b60304dd4 100644
--- a/sky/shell/platform/mac/platform_view_mac.mm
+++ b/sky/shell/platform/mac/platform_view_mac.mm
@@ -21,7 +21,7 @@ PlatformViewMac::~PlatformViewMac() {}
 void PlatformViewMac::SurfaceCreated(gfx::AcceleratedWidget widget) {
   DCHECK(window_ == gfx::kNullAcceleratedWidget);
   window_ = widget;
-  SurfaceNotificationsDirect::NotifyCreated(config_, window_);
+  SurfaceNotificationsDirect::NotifyCreated(config_, window_, nullptr);
 }
 
 void PlatformViewMac::SurfaceDestroyed() {