diff options
4 files changed, 0 insertions, 11 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 0e8de58..dac39c7 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -1300,13 +1300,6 @@ void RenderWidgetHostViewAndroid::OnDetachCompositor() { RunAckCallbacks(); } -void RenderWidgetHostViewAndroid::OnWillDestroyWindow() { - // crbug.com/324341 - // WindowAndroid and Compositor should outlive all WebContents. - NOTREACHED(); - observing_root_window_ = false; -} - void RenderWidgetHostViewAndroid::OnVSync(base::TimeTicks frame_time, base::TimeDelta vsync_period) { TRACE_EVENT0("cc", "RenderWidgetHostViewAndroid::OnVSync"); diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h index e33d812..d393d544 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.h +++ b/content/browser/renderer_host/render_widget_host_view_android.h @@ -176,7 +176,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid virtual void OnCompositingDidCommit() OVERRIDE; virtual void OnAttachCompositor() OVERRIDE {} virtual void OnDetachCompositor() OVERRIDE; - virtual void OnWillDestroyWindow() OVERRIDE; virtual void OnVSync(base::TimeTicks frame_time, base::TimeDelta vsync_period) OVERRIDE; virtual void OnAnimate(base::TimeTicks begin_frame_time) OVERRIDE; diff --git a/ui/base/android/window_android.cc b/ui/base/android/window_android.cc index 141c12e..490c6f3 100644 --- a/ui/base/android/window_android.cc +++ b/ui/base/android/window_android.cc @@ -37,8 +37,6 @@ bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { WindowAndroid::~WindowAndroid() { DCHECK(!compositor_); - FOR_EACH_OBSERVER( - WindowAndroidObserver, observer_list_, OnWillDestroyWindow()); } void WindowAndroid::OnCompositingDidCommit() { diff --git a/ui/base/android/window_android_observer.h b/ui/base/android/window_android_observer.h index 959ff8c..b9f5fba 100644 --- a/ui/base/android/window_android_observer.h +++ b/ui/base/android/window_android_observer.h @@ -14,7 +14,6 @@ class UI_BASE_EXPORT WindowAndroidObserver { virtual void OnCompositingDidCommit() = 0; virtual void OnAttachCompositor() = 0; virtual void OnDetachCompositor() = 0; - virtual void OnWillDestroyWindow() = 0; virtual void OnVSync(base::TimeTicks frame_time, base::TimeDelta vsync_period) = 0; virtual void OnAnimate(base::TimeTicks frame_begin_time) {} |