Cleanup: Move code common in ChromeClient JavaScript dialog functions to a function template.

Source/core/page/ChromeClient.cpp

 /*
  * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2012, Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 80 matching lines @@
     }
     ~ScopedJavaScriptDialogInstrumentation()
     {
         InspectorInstrumentation::didRunJavaScriptDialog(m_cookie);
     }
 
 private:
     InspectorInstrumentationCookie m_cookie;
 };
 
+template<typename ReturnType, typename... Params>
+ReturnType openJavaScriptDialog(
+    ChromeClient* chromeClient,
+    ReturnType(ChromeClient::*function)(LocalFrame*, const String& message, Params&...),
+    LocalFrame& frame,
+    const String& message,
+    Params&... parameters)
+{
+    // Defer loads in case the client method runs a new event loop that would
+    // otherwise cause the load to continue while we're in the middle of
+    // executing JavaScript.
+    ScopedPageLoadDeferrer deferrer;
+
+    chromeClient->notifyPopupOpeningObservers();
+    ScopedJavaScriptDialogInstrumentation instrumentation(frame, message);
+    return (chromeClient->*function)(&frame, message, parameters...);
+}
+
 bool ChromeClient::runBeforeUnloadConfirmPanel(const String& message, LocalFrame* frame)
 {
-    // Defer loads in case the client method runs a new event loop that would
-    // otherwise cause the load to continue while we're in the middle of executing JavaScript.
-    ScopedPageLoadDeferrer deferrer;
-
-    ScopedJavaScriptDialogInstrumentation instrumentation(*frame, message);
-    return runBeforeUnloadConfirmPanelInternal(message, frame);
+    return openJavaScriptDialog(this, &ChromeClient::runBeforeUnloadConfirmPanelInternal, *frame, message);
 }
 
 void ChromeClient::runJavaScriptAlert(LocalFrame* frame, const String& message)
 {
+    ASSERT(frame);
     if (!canRunModalIfDuringPageDismissal(frame->tree().top(), ChromeClient::AlertDialog, message))
         return;
-
-    // Defer loads in case the client method runs a new event loop that would
-    // otherwise cause the load to continue while we're in the middle of executing JavaScript.
-    ScopedPageLoadDeferrer deferrer;
-
-    ASSERT(frame);
-    notifyPopupOpeningObservers();
-
-    ScopedJavaScriptDialogInstrumentation instrumentation(*frame, message);
-    runJavaScriptAlertInternal(frame, message);
+    openJavaScriptDialog(this, &ChromeClient::runJavaScriptAlertInternal, *frame, message);
 }
 
 bool ChromeClient::runJavaScriptConfirm(LocalFrame* frame, const String& message)
 {
+    ASSERT(frame);
     if (!canRunModalIfDuringPageDismissal(frame->tree().top(), ChromeClient::ConfirmDialog, message))
         return false;
-
-    // Defer loads in case the client method runs a new event loop that would
-    // otherwise cause the load to continue while we're in the middle of executing JavaScript.
-    ScopedPageLoadDeferrer deferrer;
-
-    ASSERT(frame);
-    notifyPopupOpeningObservers();
-
-    ScopedJavaScriptDialogInstrumentation instrumentation(*frame, message);
-    return runJavaScriptConfirmInternal(frame, message);
+    return openJavaScriptDialog(this, &ChromeClient::runJavaScriptConfirmInternal, *frame, message);
 }
 
 bool ChromeClient::runJavaScriptPrompt(LocalFrame* frame, const String& prompt, const String& defaultValue, String& result)
 {
+    ASSERT(frame);
     if (!canRunModalIfDuringPageDismissal(frame->tree().top(), ChromeClient::PromptDialog, prompt))
         return false;
-
-    // Defer loads in case the client method runs a new event loop that would
-    // otherwise cause the load to continue while we're in the middle of executing JavaScript.
-    ScopedPageLoadDeferrer deferrer;
-
-    ASSERT(frame);
-    notifyPopupOpeningObservers();
-
-    ScopedJavaScriptDialogInstrumentation instrumentation(*frame, prompt);
-    return runJavaScriptPromptInternal(frame, prompt, defaultValue, result);
+    return openJavaScriptDialog(this, &ChromeClient::runJavaScriptPromptInternal, *frame, prompt, defaultValue, result);
 }
 
 void ChromeClient::mouseDidMoveOverElement(const HitTestResult& result)
 {
     if (result.innerNode()) {
         if (result.innerNode()->document().isDNSPrefetchEnabled())
             prefetchDNS(result.absoluteLinkURL().host());
     }
     showMouseOverURL(result);
 
@@ skipping 96 matching lines @@
 }
 
 void ChromeClient::notifyPopupOpeningObservers() const
 {
     const Vector<PopupOpeningObserver*> observers(m_popupOpeningObservers);
     for (size_t i = 0; i < observers.size(); ++i)
         observers[i]->willOpenPopup();
 }
 
 } // namespace blink