aura: Support SurfaceDestroyed() on Android

TBR=sky@chromium.org BUG=513540 Review URL: https://codereview.chromium.org/1406333003 Cr-Commit-Position: refs/heads/master@{#354809}
marcosholgado · Oct 19, 2015 · 58f4336 · 58f4336
1 parent 64e4009
commit 58f4336
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 1 deletion.
diff --git a/components/mus/ws/display_manager.cc b/components/mus/ws/display_manager.cc
@@ -351,6 +351,10 @@ void DefaultDisplayManager::OnAcceleratedWidgetAvailable(
   UpdateMetrics(metrics_.size_in_pixels.To<gfx::Size>(), device_pixel_ratio);
 }
 
+void DefaultDisplayManager::OnAcceleratedWidgetDestroyed() {
+  NOTREACHED();
+}
+
 void DefaultDisplayManager::OnActivationChanged(bool active) {}
 
 }  // namespace mus
diff --git a/components/mus/ws/display_manager.h b/components/mus/ws/display_manager.h
@@ -125,6 +125,7 @@ class DefaultDisplayManager : public DisplayManager,
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_pixel_ratio) override;
+  void OnAcceleratedWidgetDestroyed() override;
   void OnActivationChanged(bool active) override;
 
   mojo::ApplicationImpl* app_impl_;

diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc
@@ -41,6 +41,9 @@ class TestPlatformWindowDelegate : public ui::PlatformWindowDelegate {
                                     float device_pixel_ratio) override {
     widget_ = widget;
   }
+  void OnAcceleratedWidgetDestroyed() override {
+    NOTREACHED();
+  }
   void OnActivationChanged(bool active) override {}
 
  private:

diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc
@@ -129,6 +129,10 @@ class RenderingHelper::StubOzoneDelegate : public ui::PlatformWindowDelegate {
     accelerated_widget_ = widget;
   }
 
+  void OnAcceleratedWidgetDestroyed() override {
+    NOTREACHED();
+  }
+
   void OnActivationChanged(bool active) override {};
 
   gfx::AcceleratedWidget accelerated_widget() const {

diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc
@@ -168,6 +168,12 @@ void WindowTreeHostPlatform::OnAcceleratedWidgetAvailable(
   WindowTreeHost::OnAcceleratedWidgetAvailable();
 }
 
+void WindowTreeHostPlatform::OnAcceleratedWidgetDestroyed() {
+  gfx::AcceleratedWidget widget = compositor()->ReleaseAcceleratedWidget();
+  DCHECK_EQ(widget, widget_);
+  widget_ = gfx::kNullAcceleratedWidget;
+}
+
 void WindowTreeHostPlatform::OnActivationChanged(bool active) {
   if (active)
     OnHostActivated();

diff --git a/ui/aura/window_tree_host_platform.h b/ui/aura/window_tree_host_platform.h
@@ -52,6 +52,7 @@ class AURA_EXPORT WindowTreeHostPlatform
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_pixel_ratio) override;
+  void OnAcceleratedWidgetDestroyed() override;
   void OnActivationChanged(bool active) override;
 
   gfx::AcceleratedWidget widget_;

diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc
@@ -155,6 +155,9 @@ class DemoWindow : public ui::PlatformWindowDelegate {
     DCHECK_NE(widget, gfx::kNullAcceleratedWidget);
     widget_ = widget;
   }
+  void OnAcceleratedWidgetDestroyed() override {
+    NOTREACHED();
+  }
   void OnActivationChanged(bool active) override {}
 
  private:

diff --git a/ui/platform_window/android/platform_window_android.cc b/ui/platform_window/android/platform_window_android.cc
@@ -89,8 +89,8 @@ void PlatformWindowAndroid::SurfaceCreated(JNIEnv* env,
 
 void PlatformWindowAndroid::SurfaceDestroyed(JNIEnv* env, jobject obj) {
   DCHECK(window_);
+  delegate_->OnAcceleratedWidgetDestroyed();
   ReleaseWindow();
-  delegate_->OnAcceleratedWidgetAvailable(gfx::kNullAcceleratedWidget, 0.f);
 }
 
 void PlatformWindowAndroid::SurfaceSetSize(JNIEnv* env,

diff --git a/ui/platform_window/platform_window_delegate.h b/ui/platform_window/platform_window_delegate.h
@@ -46,6 +46,10 @@ class PlatformWindowDelegate {
   virtual void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                             float device_pixel_ratio) = 0;
 
+  // Notifies the delegate that the widget cannot be used anymore until
+  // a new widget is made available through OnAcceleratedWidgetAvailable().
+  virtual void OnAcceleratedWidgetDestroyed() = 0;
+
   virtual void OnActivationChanged(bool active) = 0;
 };