| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| 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 ad4fc6e76c61ab533c7104725f9c39d746702154..d2d6766a59280e7927b750085e8c18fe119a7e3f 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -496,8 +496,7 @@ RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
|
| if (content_view_core_)
|
| content_view_core_->RemoveObserver(this);
|
| SetContentViewCore(NULL);
|
| - if (ime_adapter_android_)
|
| - ime_adapter_android_ = nullptr;
|
| + DCHECK(!ime_adapter_android_);
|
| DCHECK(ack_callbacks_.empty());
|
| DCHECK(!delegated_frame_host_);
|
| }
|
| @@ -508,6 +507,16 @@ void RenderWidgetHostViewAndroid::Blur() {
|
| overscroll_controller_->Disable();
|
| }
|
|
|
| +void RenderWidgetHostViewAndroid::AddDestructionObserver(
|
| + DestructionObserver* observer) {
|
| + destruction_observers_.AddObserver(observer);
|
| +}
|
| +
|
| +void RenderWidgetHostViewAndroid::RemoveDestructionObserver(
|
| + DestructionObserver* observer) {
|
| + destruction_observers_.RemoveObserver(observer);
|
| +}
|
| +
|
| bool RenderWidgetHostViewAndroid::OnMessageReceived(
|
| const IPC::Message& message) {
|
| if (IPC_MESSAGE_ID_CLASS(message.type()) == SyncCompositorMsgStart) {
|
| @@ -1019,6 +1028,10 @@ void RenderWidgetHostViewAndroid::Destroy() {
|
| if (GetTextInputManager() && GetTextInputManager()->HasObserver(this))
|
| GetTextInputManager()->RemoveObserver(this);
|
|
|
| + for (auto& observer : destruction_observers_)
|
| + observer.RenderWidgetHostViewDestroyed(this);
|
| + destruction_observers_.Clear();
|
| +
|
| delete this;
|
| }
|
|
|
|
|