Stop using nested message loop for alert() and other JS dialogs

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 644 matching lines @@
 #endif
 
   lazy_tls.Pointer()->Set(this);
 
   // Register this object as the main thread.
   ChildProcess::current()->set_main_thread(this);
 
   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;
   idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs;
   idle_notifications_to_skip_ = 0;
   layout_test_mode_ = false;
 
   appcache_dispatcher_.reset(
       new AppCacheDispatcher(Get(), new AppCacheFrontendImpl()));
   dom_storage_dispatcher_.reset(new DomStorageDispatcher());
@@ skipping 324 matching lines @@
   // is processing this request. This creates an opportunity for re-entrancy
   // into WebKit, so we need to take care to disable callbacks, timers, and
   // pending network loads that could trigger such callbacks.
   bool pumping_events = false;
   if (msg->is_sync()) {
     if (msg->is_caller_pumping_messages()) {
       pumping_events = true;
     }
   }
 
-  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();
   }
 
   return rv;
 }
 
 IPC::SyncChannel* RenderThreadImpl::GetChannel() {
   return channel();
 }
 
@@ skipping 634 matching lines @@
 scoped_refptr<base::SingleThreadTaskRunner>
 RenderThreadImpl::GetIOThreadTaskRunner() {
   return io_thread_task_runner_;
 }
 
 std::unique_ptr<base::SharedMemory> RenderThreadImpl::AllocateSharedMemory(
     size_t size) {
   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;
   while ((observer = it.GetNext()) != NULL) {
     if (observer->OnControlMessageReceived(msg))
       return true;
   }
 
   // Some messages are handled by delegates.
   if (appcache_dispatcher_->OnMessageReceived(msg) ||
@@ skipping 411 matching lines @@
 }
 
 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
   size_t erased =
       RenderThreadImpl::current()->pending_render_frame_connects_.erase(
           routing_id_);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace content