Revert 252883 "Remove tests and code for showModalDialog"

trunk/src/content/renderer/render_view_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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1696 matching lines @@
   SendAndRunNestedMessageLoop(new ViewHostMsg_RunJavaScriptMessage(
       routing_id_, message, default_value, frame_url, type, &success, result));
   return success;
 }
 
 bool RenderViewImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
   // Before WebKit asks us to show an alert (etc.), it takes care of doing the
   // equivalent of WebView::willEnterModalLoop.  In the case of showModalDialog
   // it is particularly important that we do not call willEnterModalLoop as
   // that would defer resource loads for the dialog itself.
-  // TODO(jamesr): Now that we no longer support showModalDialog, see if we can
-  // simplify this logic.
   if (RenderThreadImpl::current())  // Will be NULL during unit tests.
     RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop();
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   return Send(message);
 }
 
 void RenderViewImpl::GetWindowSnapshot(const WindowSnapshotCallback& callback) {
   int id = next_snapshot_id_++;
   pending_snapshots_.insert(std::make_pair(id, callback));
@@ skipping 688 matching lines @@
 
   // NOTE: initial_pos_ may still have its default values at this point, but
   // that's okay.  It'll be ignored if disposition is not NEW_POPUP, or the
   // browser process will impose a default position otherwise.
   Send(new ViewHostMsg_ShowView(opener_id_, routing_id_,
       NavigationPolicyToDisposition(policy), initial_pos_,
       opened_by_user_gesture_));
   SetPendingWindowRect(initial_pos_);
 }
 
+void RenderViewImpl::runModal() {
+  DCHECK(did_show_) << "should already have shown the view";
+
+  // Don't allow further dialogs if we are waiting to swap out, since the
+  // PageGroupLoadDeferrer in our stack prevents it.
+  if (suppress_dialogs_until_swap_out_)
+    return;
+
+  // We must keep WebKit's shared timer running in this case in order to allow
+  // showModalDialog to function properly.
+  //
+  // TODO(darin): WebKit should really be smarter about suppressing events and
+  // timers so that we do not need to manage the shared timer in such a heavy
+  // handed manner.
+  //
+  if (RenderThreadImpl::current())  // Will be NULL during unit tests.
+    RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
+
+  SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(
+      routing_id_, opener_id_));
+}
+
 bool RenderViewImpl::enterFullScreen() {
   Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true));
   return true;
 }
 
 void RenderViewImpl::exitFullScreen() {
   Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false));
 }
 
 bool RenderViewImpl::requestPointerLock() {
@@ skipping 3086 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content