Changeset 83375 in webkit

Timestamp:

Apr 9, 2011 1:01:20 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-09 Sreeram Ramachandran <​sreeram@google.com>

Reviewed by Ryosuke Niwa.

Gather data on modal dialogs shown during unload events
​https://bugs.webkit.org/show_bug.cgi?id=58115

Add a new method to the ChromeClient API to allow clients to receive
notifications of modal dialogs dispatched during page dismissal events.
The new method has a default empty definition; only chromium overrides
it to keep track of histograms.

No tests because this is a no-op for all ports except chromium (and it's
not clear how to test chromium histograms from webkit).

• page/Chrome.cpp: (WebCore::isDuringPageDismissal): (WebCore::willRunModalDialog): (WebCore::Chrome::runJavaScriptAlert): (WebCore::Chrome::runJavaScriptConfirm): (WebCore::Chrome::runJavaScriptPrompt): (WebCore::Chrome::willRunModalHTMLDialog):
• page/Chrome.h:
• page/ChromeClient.h: (WebCore::ChromeClient::willRunModalDialogDuringPageDismissal):
• page/DOMWindow.cpp: (WebCore::DOMWindow::showModalDialog):

2011-04-09 Sreeram Ramachandran <​sreeram@google.com>

Reviewed by Ryosuke Niwa.

Gather data on modal dialogs shown during unload events
​https://bugs.webkit.org/show_bug.cgi?id=58115

Implementation of the new API to receive notifications of modal dialogs
dispatched during unload events. Count the notifications through a histogram.

No tests because it's not clear how to test chromium histograms from webkit.

• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::willRunModalDialogDuringPageDismissal):
• src/ChromeClientImpl.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Chrome.cpp (modified) (4 diffs)
• WebCore/page/Chrome.h (modified) (1 diff)
• WebCore/page/ChromeClient.h (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/ChromeClientImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-09  Sreeram Ramachandran  <sreeram@google.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        Gather data on modal dialogs shown during unload events
+        https://bugs.webkit.org/show_bug.cgi?id=58115
+
+        Add a new method to the ChromeClient API to allow clients to receive
+        notifications of modal dialogs dispatched during page dismissal events.
+        The new method has a default empty definition; only chromium overrides
+        it to keep track of histograms.
+
+        No tests because this is a no-op for all ports except chromium (and it's
+        not clear how to test chromium histograms from webkit).
+
+        * page/Chrome.cpp:
+        (WebCore::isDuringPageDismissal):
+        (WebCore::willRunModalDialog):
+        (WebCore::Chrome::runJavaScriptAlert):
+        (WebCore::Chrome::runJavaScriptConfirm):
+        (WebCore::Chrome::runJavaScriptPrompt):
+        (WebCore::Chrome::willRunModalHTMLDialog):
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::willRunModalDialogDuringPageDismissal):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::showModalDialog):
+
 2011-04-08  David Humphrey  <david.humphrey@senecac.on.ca>
 

trunk/Source/WebCore/page/Chrome.cpp

@@ -281 +281 @@
 }
 
+static inline void willRunModalDialog(const Frame* frame, const ChromeClient::DialogType& dialogType, const ChromeClient* client)
+{
+    if (frame->loader()->pageDismissalEventBeingDispatched())
+        client->willRunModalDialogDuringPageDismissal(dialogType);
+}
+
 void Chrome::runJavaScriptAlert(Frame* frame, const String& message)
 {
+    willRunModalDialog(frame, ChromeClient::AlertDialog, m_client);
+
     // 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.
@@ -293 +301 @@
 bool Chrome::runJavaScriptConfirm(Frame* frame, const String& message)
 {
+    willRunModalDialog(frame, ChromeClient::ConfirmDialog, m_client);
+
     // 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.
@@ -303 +313 @@
 bool Chrome::runJavaScriptPrompt(Frame* frame, const String& prompt, const String& defaultValue, String& result)
 {
+    willRunModalDialog(frame, ChromeClient::PromptDialog, m_client);
+
     // 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.
@@ -548 +560 @@
 }
 
+void Chrome::willRunModalHTMLDialog(const Frame* frame) const
+{
+    willRunModalDialog(frame, ChromeClient::HTMLDialog, m_client);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/Chrome.h

@@ -176 +176 @@
 #endif
 
+        void willRunModalHTMLDialog(const Frame*) const;
+
     private:
         Page* m_page;

trunk/Source/WebCore/page/ChromeClient.h

@@ -304 +304 @@
         virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { }
 
+        enum DialogType {
+            AlertDialog = 0,
+            ConfirmDialog = 1,
+            PromptDialog = 2,
+            HTMLDialog = 3,
+            NumDialogTypes = 4
+        };
+        virtual void willRunModalDialogDuringPageDismissal(const DialogType&) const { }
+
     protected:
         virtual ~ChromeClient() { }

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1839 +1839 @@
         return;
 
+    if (m_frame->page())
+        m_frame->page()->chrome()->willRunModalHTMLDialog(m_frame);
+
     if (!canShowModalDialogNow(m_frame) || !firstWindow->allowPopUp())
         return;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-09  Sreeram Ramachandran  <sreeram@google.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        Gather data on modal dialogs shown during unload events
+        https://bugs.webkit.org/show_bug.cgi?id=58115
+
+        Implementation of the new API to receive notifications of modal dialogs
+        dispatched during unload events. Count the notifications through a histogram.
+
+        No tests because it's not clear how to test chromium histograms from webkit.
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::willRunModalDialogDuringPageDismissal):
+        * src/ChromeClientImpl.h:
+
 2011-04-08  Aaron Boodman  <aa@chromium.org>
 

trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -55 +55 @@
 #include "NotificationPresenterImpl.h"
 #include "Page.h"
+#include "PlatformBridge.h"
 #include "PopupMenuChromium.h"
 #include "RenderWidget.h"
@@ -906 +907 @@
 }
 
+void ChromeClientImpl::willRunModalDialogDuringPageDismissal(const DialogType& dialogType) const
+{
+    PlatformBridge::histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", static_cast<int>(dialogType), static_cast<int>(NumDialogTypes));
+}
+
 } // namespace WebKit

trunk/Source/WebKit/chromium/src/ChromeClientImpl.h

@@ -192 +192 @@
 #endif
 
+    virtual void willRunModalDialogDuringPageDismissal(const DialogType&) const;
+
 private:
     void getPopupMenuInfo(WebCore::PopupContainer*, WebPopupMenuInfo*);