Not for commint: Revert 6ed4d4373c5ce4743850df50f94b867240472033

content/renderer/render_frame_impl.cc

 // Copyright 2013 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_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2278 matching lines @@
       GetRenderWidget()->GetWebWidget()->textInputInfo();
   FormFieldData field;
   field.text = info.value.utf8();
   field.placeholder = element.getAttribute("placeholder").utf8();
   field.text_input_type = GetRenderWidget()->GetTextInputType();
 
   Send(new FrameHostMsg_FocusedFormFieldDataResponse(routing_id_, request_id,
                                                      field));
 }
 
+bool RenderFrameImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
+  if (RenderThreadImpl::current())
+    RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop();
+  message->EnableMessagePumping();
+  return Send(message);
+}
+
 bool RenderFrameImpl::RunJavaScriptMessage(JavaScriptMessageType type,
                                            const base::string16& message,
                                            const base::string16& default_value,
                                            const GURL& frame_url,
                                            base::string16* result) {
   // Don't allow further dialogs if we are waiting to swap out, since the
   // ScopedPageLoadDeferrer in our stack prevents it.
   if (suppress_further_dialogs_)
     return false;
 
   int32_t message_length = static_cast<int32_t>(message.length());
   if (WebUserGestureIndicator::processedUserGestureSinceLoad(frame_)) {
     UMA_HISTOGRAM_COUNTS("JSDialogs.CharacterCount.UserGestureSinceLoad",
                          message_length);
   } else {
     UMA_HISTOGRAM_COUNTS("JSDialogs.CharacterCount.NoUserGestureSinceLoad",
                          message_length);
   }
 
   bool success = false;
   base::string16 result_temp;
   if (!result)
     result = &result_temp;
 
-  Send(new FrameHostMsg_RunJavaScriptMessage(
+  SendAndRunNestedMessageLoop(new FrameHostMsg_RunJavaScriptMessage(
       routing_id_, message, default_value, frame_url, type, &success, result));
   return success;
 }
 
 bool RenderFrameImpl::ScheduleFileChooser(
     const FileChooserParams& params,
     blink::WebFileChooserCompletion* completion) {
   static const size_t kMaximumPendingFileChooseRequests = 4;
 
   // Do not open the file dialog in a hidden RenderFrame.
@@ skipping 4330 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content