| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index fdba7c596ae48e0f141bcbae111a34a971994741..6bc0bcc62147d839e2837f8be08589759ff67f20 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -662,7 +662,6 @@ void RenderThreadImpl::Init(
|
| InitializeWebKit(resource_task_queue);
|
|
|
| // In single process the single process is all there is.
|
| - notify_webkit_of_modal_loop_ = true;
|
| webkit_shared_timer_suspended_ = false;
|
| widget_count_ = 0;
|
| hidden_widget_count_ = 0;
|
| @@ -1007,22 +1006,15 @@ bool RenderThreadImpl::Send(IPC::Message* msg) {
|
| }
|
| }
|
|
|
| - bool notify_webkit_of_modal_loop = true; // default value
|
| - std::swap(notify_webkit_of_modal_loop, notify_webkit_of_modal_loop_);
|
| -
|
| if (pumping_events) {
|
| renderer_scheduler_->SuspendTimerQueue();
|
| -
|
| - if (notify_webkit_of_modal_loop)
|
| - WebView::willEnterModalLoop();
|
| + WebView::willEnterModalLoop();
|
| }
|
|
|
| bool rv = ChildThreadImpl::Send(msg);
|
|
|
| if (pumping_events) {
|
| - if (notify_webkit_of_modal_loop)
|
| - WebView::didExitModalLoop();
|
| -
|
| + WebView::didExitModalLoop();
|
| renderer_scheduler_->ResumeTimerQueue();
|
| }
|
|
|
| @@ -1677,10 +1669,6 @@ std::unique_ptr<base::SharedMemory> RenderThreadImpl::AllocateSharedMemory(
|
| return HostAllocateSharedMemoryBuffer(size);
|
| }
|
|
|
| -void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() {
|
| - notify_webkit_of_modal_loop_ = false;
|
| -}
|
| -
|
| bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
|
| base::ObserverListBase<RenderThreadObserver>::Iterator it(&observers_);
|
| RenderThreadObserver* observer;
|
|
|