Reviewed by Adam.

        - WebKit part of fix for <rdar://problem/5262230> Crash while loading a popup in addictinggames.com

        Made closeWindowSoon fire on a timer instead of happening synchronously.

        * WebChromeClient.cpp:
        (WebChromeClient::closeWindowSoon): Actually close the window on a timer, not immediately.
        * WebKit.vcproj/WebKit.vcproj:
        * WebView.cpp:
        (WebView::WebView):
        (WebView::closeWindowSoon):
        (WebView::closeWindowTimerFired):
        * WebView.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24463 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 4c1302df043824ee5d8d28d97cad4746aa1eeb64..a418df8ff727498cfa35ec210c0aa1fce4ff5117 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,20 @@
+2007-07-19  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adam.
+        
+        - WebKit part of fix for <rdar://problem/5262230> Crash while loading a popup in addictinggames.com
+        
+        Made closeWindowSoon fire on a timer instead of happening synchronously.
+
+        * WebChromeClient.cpp:
+        (WebChromeClient::closeWindowSoon): Actually close the window on a timer, not immediately.
+        * WebKit.vcproj/WebKit.vcproj:
+        * WebView.cpp:
+        (WebView::WebView):
+        (WebView::closeWindowSoon):
+        (WebView::closeWindowTimerFired):
+        * WebView.h:
+
 2007-07-18  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Adam.

diff --git a/WebKit/win/WebChromeClient.cpp b/WebKit/win/WebChromeClient.cpp
index 3a4520e29467ca91ce68ee23b97e0094b0f47c33..e94e623cb6d2937353572fd78ad82e36d76265ce 100644 (file)
--- a/WebKit/win/WebChromeClient.cpp
+++ b/WebKit/win/WebChromeClient.cpp
@@ -319,7 +319,7 @@ void WebChromeClient::closeWindowSoon()
 
     m_webView->setGroupName(0);
     m_webView->stopLoading(0);
-    m_webView->closeWindow();
+    m_webView->closeWindowSoon();
 }
 
 void WebChromeClient::runJavaScriptAlert(Frame*, const String& message)

diff --git a/WebKit/win/WebKit.vcproj/WebKit.vcproj b/WebKit/win/WebKit.vcproj/WebKit.vcproj
index 763bbbad6aefd2f248f489150a085a6eb50b0963..b4621023d46e3a449435b81d6e12a9f12b804899 100644 (file)
--- a/WebKit/win/WebKit.vcproj/WebKit.vcproj
+++ b/WebKit/win/WebKit.vcproj/WebKit.vcproj
@@ -54,7 +54,7 @@
                                WarnAsError="true"
                                Detect64BitPortabilityProblems="true"
                                DebugInformationFormat="3"
-                               DisableSpecificWarnings="4127"
+                               DisableSpecificWarnings="4127;4355"
                                ForcedIncludeFiles="CodeAnalysisConfig.h"
                                EnablePREfast="$(EnablePREfast)"
                        />
@@ -145,7 +145,7 @@
                                WarnAsError="true"
                                Detect64BitPortabilityProblems="true"
                                DebugInformationFormat="3"
-                               DisableSpecificWarnings="4127"
+                               DisableSpecificWarnings="4127;4355"
                                ForcedIncludeFiles="CodeAnalysisConfig.h"
                                EnablePREfast="$(EnablePREfast)"
                        />
@@ -240,7 +240,7 @@
                                WarnAsError="true"
                                Detect64BitPortabilityProblems="true"
                                DebugInformationFormat="3"
-                               DisableSpecificWarnings="4127"
+                               DisableSpecificWarnings="4127;4355"
                                ForcedIncludeFiles="CodeAnalysisConfig.h"
                                EnablePREfast="$(EnablePREfast)"
                        />

diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index d5d20b3e67a8e248fcd2b4425b863fbbe00402b1..50938561137123af39789b0c7360ec6e6cded2c5 100644 (file)
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -138,6 +138,7 @@ WebView::WebView()
 , m_didClose(false)
 , m_inIMEComposition(0)
 , m_toolTipHwnd(0)
+, m_closeWindowTimer(this, &WebView::closeWindowTimerFired)
 {
     KJS::Collector::registerAsMainThread();
 
@@ -543,6 +544,18 @@ void WebView::frameRect(RECT* rect)
     ::GetWindowRect(m_viewWindow, rect);
 }
 
+void WebView::closeWindowSoon()
+{
+    m_closeWindowTimer.startOneShot(0);
+    AddRef();
+}
+
+void WebView::closeWindowTimerFired(WebCore::Timer<WebView>*)
+{
+    closeWindow();
+    Release();
+}
+
 void WebView::closeWindow()
 {
     if (m_hasSpellCheckerDocumentTag) {

diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h
index 199089e31ecbeb87420fddc1abdcb26a28fd429c..ea811b911b81e50079b90b00857f4135ae8f5ddb 100644 (file)
--- a/WebKit/win/WebView.h
+++ b/WebKit/win/WebView.h
@@ -34,6 +34,7 @@
 #include "WebFrame.h"
 
 #include <WebCore/IntRect.h>
+#include <WebCore/Timer.h>
 #include <wtf/OwnPtr.h>
 
 class WebFrame;
@@ -631,6 +632,7 @@ public:
     void deleteBackingStore();
     void frameRect(RECT* rect);
     void closeWindow();
+    void closeWindowSoon();
     void close();
     bool didClose() const { return m_didClose; }
     void setProhibitsMainFrameScrolling(bool = true);
@@ -673,10 +675,12 @@ protected:
     bool continuousCheckingAllowed();
     void initializeCacheSizesIfNecessary();
     void initializeToolTipWindow();
+    void closeWindowTimerFired(WebCore::Timer<WebView>*);
     void prepareCandidateWindow(WebCore::Frame*, HIMC);
     void updateSelectionForIME();
     bool onIMERequestCharPosition(WebCore::Frame*, IMECHARPOSITION*, LRESULT*);
     bool onIMERequestReconvertString(WebCore::Frame*, RECONVERTSTRING*, LRESULT*);
+
     ULONG m_refCount;
     WebCore::String m_groupName;
     HWND m_hostWindow;
@@ -721,6 +725,8 @@ protected:
     WebCore::String m_toolTip;
 
     static bool s_allowSiteSpecificHacks;
+
+    WebCore::Timer<WebView> m_closeWindowTimer;
 };
 
 #endif