Don't wait to notify client of spoof attempt if a modal dialog is created.

Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 303 matching lines @@
     if (policy == WebNavigationPolicyIgnore)
         policy = getNavigationPolicy();
     m_webView->client()->show(policy);
 }
 
 bool ChromeClientImpl::canRunModal()
 {
     return !!m_webView->client();
 }
 
 void ChromeClientImpl::runModal()

[darin (slow to review), 2013/09/03 23:21:45]

I think you may need a similar thing here. This corresponds to
window.showModalDialog(). I wonder also about window.print().

If we called forceNotifyForInitialDocumentAccess() inside
WebView::willEnterModalLoop(), then we'd avoid these lose ends. That might be
the better solution.

[Charlie Reis, 2013/09/04 00:01:10]

Would we just assume it's the main frame?
Yeah, it would be really nice to catch all of these in one place. 
Unfortunately, WebView::willEnterModalLoop isn't called for them.  The comment
in RenderViewImpl::SendAndRunNestedMessageLoop seems to suggest WebKit is doing
the equivalent somewhere else, but I'm not sure what it's referring to.  I also
looked at Chrome::runJavaScriptPrompt (et al), but nothing stood out.

Is there another place we could catch them all?

 {
     if (m_webView->client())
         m_webView->client()->runModal();
 }
 
 void ChromeClientImpl::setToolbarsVisible(bool value)
 {
     m_toolbarsVisible = value;
 }
 
@@ skipping 57 matching lines @@
 }
 
 bool ChromeClientImpl::canRunBeforeUnloadConfirmPanel()
 {
     return !!m_webView->client();
 }
 
 bool ChromeClientImpl::runBeforeUnloadConfirmPanel(const String& message, Frame* frame)
 {
     if (m_webView->client()) {
+        if (frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument())
+            frame->loader()->forceNotifyForInitialDocumentAccess();
         return m_webView->client()->runModalBeforeUnloadDialog(
             WebFrameImpl::fromFrame(frame), message);
     }
     return false;
 }
 
 void ChromeClientImpl::closeWindowSoon()
 {
     // Make sure this Page can no longer be found by JS.
     m_webView->page()->clearPageGroup();
 
     // Make sure that all loading is stopped.  Ensures that JS stops executing!
     m_webView->mainFrame()->stopLoading();
 
     if (m_webView->client())
         m_webView->client()->closeWidgetSoon();
 }
 
 // Although a Frame is passed in, we don't actually use it, since we
 // already know our own m_webView.
 void ChromeClientImpl::runJavaScriptAlert(Frame* frame, const String& message)
 {
     if (m_webView->client()) {
         if (WebUserGestureIndicator::isProcessingUserGesture())
             WebUserGestureIndicator::currentUserGestureToken().setJavascriptPrompt();
+        if (frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument())
+            frame->loader()->forceNotifyForInitialDocumentAccess();
         m_webView->client()->runModalAlertDialog(
             WebFrameImpl::fromFrame(frame), message);
     }
 }
 
 // See comments for runJavaScriptAlert().
 bool ChromeClientImpl::runJavaScriptConfirm(Frame* frame, const String& message)
 {
     if (m_webView->client()) {
         if (WebUserGestureIndicator::isProcessingUserGesture())
             WebUserGestureIndicator::currentUserGestureToken().setJavascriptPrompt();
+        if (frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument())
+            frame->loader()->forceNotifyForInitialDocumentAccess();
         return m_webView->client()->runModalConfirmDialog(
             WebFrameImpl::fromFrame(frame), message);
     }
     return false;
 }
 
 // See comments for runJavaScriptAlert().
 bool ChromeClientImpl::runJavaScriptPrompt(Frame* frame,
                                            const String& message,
                                            const String& defaultValue,
                                            String& result)
 {
     if (m_webView->client()) {
         if (WebUserGestureIndicator::isProcessingUserGesture())
             WebUserGestureIndicator::currentUserGestureToken().setJavascriptPrompt();
+        if (frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument())

[darin (slow to review), 2013/09/03 23:21:45]

It kind of sucks to repeat the stateMachine condition for all of these. Maybe
the method on FrameLoader should include the stateMachine check. The challenge
then is to come up with a good name for the method that isn't a zillion
characters long.

[Charlie Reis, 2013/09/04 00:01:10]

Fair point.  I ended up putting it second in the if clause of
notifyIfInitialDocumentAccessed(), since the timer check is quicker and almost
always false.

+            frame->loader()->forceNotifyForInitialDocumentAccess();
         WebString actualValue;
         bool ok = m_webView->client()->runModalPromptDialog(
             WebFrameImpl::fromFrame(frame),
             message,
             defaultValue,
             &actualValue);
         if (ok)
             result = actualValue;
         return ok;
     }
@@ skipping 553 matching lines @@
 {
 }
 
 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
 {
     m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
 }
 #endif
 
 } // namespace WebKit