Changeset 28505 in webkit

Timestamp:

Dec 6, 2007 6:00:27 PM (16 years ago)

Author:

alice.liu@apple.com

Message:

Fixed <rdar://5540000> onbeforeunload doesn't fire when closing window/tab

Reviewed by Darin.

• Interfaces/IWebViewPrivate.idl:
• WebView.cpp: (WebView::shouldClose):
• WebView.h:

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• Interfaces/IWebViewPrivate.idl (modified) (1 diff)
• WebView.cpp (modified) (1 diff)
• WebView.h (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2007-12-06  Alice Liu  <alice.liu@apple.com>
+
+        Fixed <rdar://5540000> onbeforeunload doesn't fire when closing window/tab
+
+        Reviewed by Darin.
+
+        * Interfaces/IWebViewPrivate.idl:
+        * WebView.cpp:
+        (WebView::shouldClose):
+        * WebView.h:
+
 2007-12-06  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/Interfaces/IWebViewPrivate.idl

@@ -128 +128 @@
     // SPI for DumpRenderTree. This is global to all WebViews.
     HRESULT setShouldApplyMacFontAscentHack([in] BOOL shouldApply);
+
+    /*!
+        @method shouldClose:
+        @abstract This function will fire the before unload handler for a page.  
+        If the user cancels the closing of a webview from the alert popped up by the 
+        before unload handler, then this function will return false.
+    */
+    HRESULT shouldClose([out, retval] BOOL* result);
 }

trunk/WebKit/win/WebView.cpp

@@ -4145 +4145 @@
 }
 
+HRESULT STDMETHODCALLTYPE WebView::shouldClose( 
+    /* [retval][out] */ BOOL* result)
+{
+    if (!result) {
+        ASSERT_NOT_REACHED();
+        return E_POINTER;
+    }
+
+    *result = TRUE;
+    if (Frame* frame = m_page->focusController()->focusedOrMainFrame())
+        *result = frame->shouldClose() ? TRUE : FALSE;
+    return S_OK;
+}
+
 HRESULT WebView::registerDragDrop()
 {

trunk/WebKit/win/WebView.h

@@ -620 +620 @@
 
     virtual HRESULT STDMETHODCALLTYPE clearUndoRedoOperations( void);
+    virtual HRESULT STDMETHODCALLTYPE shouldClose( 
+        /* [retval][out] */ BOOL* result);
 
     virtual HRESULT STDMETHODCALLTYPE setProhibitsMainFrameScrolling(BOOL);