[DevTools] Add dialog type and return value to Page.javascriptDialog{Opening,Closed}.

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 59 matching lines @@
 
 void ChromeClient::setWindowFeatures(const WindowFeatures& features)
 {
     setToolbarsVisible(features.toolBarVisible || features.locationBarVisible);
     setStatusbarVisible(features.statusBarVisible);
     setScrollbarsVisible(features.scrollbarsVisible);
     setMenubarVisible(features.menuBarVisible);
     setResizable(features.resizable);
 }
 
-class ScopedJavaScriptDialogInstrumentation {
-    STACK_ALLOCATED();
-public:
-    ScopedJavaScriptDialogInstrumentation(LocalFrame& frame, const String& message)
-        : m_cookie(InspectorInstrumentation::willRunJavaScriptDialog(&frame, message))
-    {
-    }
-    ~ScopedJavaScriptDialogInstrumentation()
-    {
-        InspectorInstrumentation::didRunJavaScriptDialog(m_cookie);
-    }
-
-private:
-    InspectorInstrumentationCookie m_cookie;
-};
-
-template<typename ReturnType, typename... Params>
-ReturnType openJavaScriptDialog(
+template<typename... Params>
+bool openJavaScriptDialog(
     ChromeClient* chromeClient,
-    ReturnType(ChromeClient::*function)(LocalFrame*, const String& message, Params&...),
+    bool(ChromeClient::*function)(LocalFrame*, const String& message, Params&...),
     LocalFrame& frame,
     const String& message,
+    ChromeClient::DialogType dialogType,
     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;
 
-    ScopedJavaScriptDialogInstrumentation instrumentation(frame, message);
-    return (chromeClient->*function)(&frame, message, parameters...);
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(&frame, message, dialogType);
+    bool result = (chromeClient->*function)(&frame, message, parameters...);
+    InspectorInstrumentation::didRunJavaScriptDialog(cookie, result);
+    return result;
 }
 
 bool ChromeClient::openBeforeUnloadConfirmPanel(const String& message, LocalFrame* frame)
 {
     ASSERT(frame);
-    return openJavaScriptDialog(this, &ChromeClient::openBeforeUnloadConfirmPanelDelegate, *frame, message);
+    return openJavaScriptDialog(this, &ChromeClient::openBeforeUnloadConfirmPanelDelegate, *frame, message, ChromeClient::HTMLDialog);
 }
 
-void ChromeClient::openJavaScriptAlert(LocalFrame* frame, const String& message)
+bool ChromeClient::openJavaScriptAlert(LocalFrame* frame, const String& message)
 {
     ASSERT(frame);
     if (!canOpenModalIfDuringPageDismissal(frame->tree().top(), ChromeClient::AlertDialog, message))
-        return;
-    openJavaScriptDialog(this, &ChromeClient::openJavaScriptAlertDelegate, *frame, message);
+        return false;
+    return openJavaScriptDialog(this, &ChromeClient::openJavaScriptAlertDelegate, *frame, message, ChromeClient::AlertDialog);
 }
 
 bool ChromeClient::openJavaScriptConfirm(LocalFrame* frame, const String& message)
 {
     ASSERT(frame);
     if (!canOpenModalIfDuringPageDismissal(frame->tree().top(), ChromeClient::ConfirmDialog, message))
         return false;
-    return openJavaScriptDialog(this, &ChromeClient::openJavaScriptConfirmDelegate, *frame, message);
+    return openJavaScriptDialog(this, &ChromeClient::openJavaScriptConfirmDelegate, *frame, message, ChromeClient::ConfirmDialog);
 }
 
 bool ChromeClient::openJavaScriptPrompt(LocalFrame* frame, const String& prompt, const String& defaultValue, String& result)
 {
     ASSERT(frame);
     if (!canOpenModalIfDuringPageDismissal(frame->tree().top(), ChromeClient::PromptDialog, prompt))
         return false;
-    return openJavaScriptDialog(this, &ChromeClient::openJavaScriptPromptDelegate, *frame, prompt, defaultValue, result);
+    return openJavaScriptDialog(this, &ChromeClient::openJavaScriptPromptDelegate, *frame, prompt, ChromeClient::PromptDialog, defaultValue, result);
 }
 
 void ChromeClient::mouseDidMoveOverElement(const HitTestResult& result)
 {
     if (result.innerNode() && result.innerNode()->document().isDNSPrefetchEnabled())
         prefetchDNS(result.absoluteLinkURL().host());
 
     showMouseOverURL(result);
 
     setToolTip(result);
@@ skipping 35 matching lines @@
 {
     // 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;
 
     printDelegate(frame);
 }
 
 } // namespace blink