[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mjs at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 8369a241fd15ef4199f1b72b579b7339cef9a3a9
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 00:17:10 2011 +0000

    2011-01-11  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Anders Carlsson.
    
            UIProcess kills the WebProcess sometimes when detached frames exist
            https://bugs.webkit.org/show_bug.cgi?id=52227
    
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::didSaveFrameToPageCache): Don't consider the message invalid
            if it came in for a detached frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75566 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 63ab06f..c85b013 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        UIProcess kills the WebProcess sometimes when detached frames exist
+        https://bugs.webkit.org/show_bug.cgi?id=52227
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didSaveFrameToPageCache): Don't consider the message invalid
+        if it came in for a detached frame.
+
 2011-01-11  Anders Carlsson  <andersca at apple.com>
 
         Build fix.
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index d691a65..19f2ee7 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -997,6 +997,10 @@ void WebPageProxy::didSaveFrameToPageCache(uint64_t frameID)
 
     WebFrameProxy* subframe = process()->webFrame(frameID);
     MESSAGE_CHECK(subframe);
+
+    if (!subframe->parentFrame())
+        return;
+
     MESSAGE_CHECK(subframe->isDescendantOf(m_mainFrame.get()));
 
     subframe->didRemoveFromHierarchy();

-- 
WebKit Debian packaging