Not for commint: Revert 6ed4d4373c5ce4743850df50f94b867240472033

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 641 matching lines @@
         ui::GpuService::Create(GetServiceManagerConnection()->GetConnector(),
                                ChildProcess::current()->io_task_runner());
   }
 #endif
   gpu_memory_buffer_manager_ =
       base::MakeUnique<ChildGpuMemoryBufferManager>(thread_safe_sender());
 
   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;
 
   appcache_dispatcher_.reset(
       new AppCacheDispatcher(Get(), new AppCacheFrontendImpl()));
   dom_storage_dispatcher_.reset(new DomStorageDispatcher());
   main_thread_indexed_db_dispatcher_.reset(new IndexedDBDispatcher());
@@ skipping 375 matching lines @@
   // may create an opportunity for re-entrancy into WebKit and other subsystems,
   // 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;
+  std::swap(notify_webkit_of_modal_loop, notify_webkit_of_modal_loop_);
+
   if (pumping_events) {
     renderer_scheduler_->SuspendTimerQueue();
-    WebView::willEnterModalLoop();
+    if (notify_webkit_of_modal_loop)
+      WebView::willEnterModalLoop();
   }
 
   bool rv = ChildThreadImpl::Send(msg);
 
   if (pumping_events) {
-    WebView::didExitModalLoop();
+    if (notify_webkit_of_modal_loop)
+      WebView::didExitModalLoop();
+
     renderer_scheduler_->ResumeTimerQueue();
   }
 
   return rv;
 }
 
 IPC::SyncChannel* RenderThreadImpl::GetChannel() {
   return channel();
 }
 
@@ skipping 628 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;
+}
+
 void RenderThreadImpl::OnChannelError() {
   // In single-process mode, the renderer can't be restarted after shutdown.
   // So, if we get a channel error, crash the whole process right now to get a
   // more informative stack, since we will otherwise just crash later when we
   // try to restart it.
   CHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess));
   ChildThreadImpl::OnChannelError();
 }
 
@@ skipping 761 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content