[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

aroben at apple.com aroben at apple.com
Thu Apr 8 00:55:00 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 1db94bebe2b31b223eeff328edc1517842236b91
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 23:06:57 2010 +0000

    Remove dead code in WebViewWndProc
    
    Fixes <http://webkit.org/b/33218>.
    
    Reviewed by Darin Adler.
    
    * WebView.cpp:
    (WebView::WebViewWndProc): Removed a redundant isBeingDestroyed check.
    We bail out much earlier in this function if isBeingDestroyed is true.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52827 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 378c8ff..a238075 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-05  Adam Roben  <aroben at apple.com>
+
+        Remove dead code in WebViewWndProc
+
+        Fixes <http://webkit.org/b/33218>.
+
+        Reviewed by Darin Adler.
+
+        * WebView.cpp:
+        (WebView::WebViewWndProc): Removed a redundant isBeingDestroyed check.
+        We bail out much earlier in this function if isBeingDestroyed is true.
+
 2010-01-04  Jon Honeycutt  <jhoneycutt at apple.com>
 
         MSAA: Accessibility role of <select> elements is wrong
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 210f9df..bb8c2f1 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -1954,10 +1954,6 @@ LRESULT CALLBACK WebView::WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam,
             break;
         // FIXME: We need to check WM_UNICHAR to support supplementary characters (that don't fit in 16 bits).
         case WM_SIZE:
-            if (webView->isBeingDestroyed())
-                // If someone has sent us this message while we're being destroyed, we should bail out so we don't crash.
-                break;
-
             if (lParam != 0) {
                 webView->deleteBackingStore();
 #if USE(ACCELERATED_COMPOSITING)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list