[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tonyg at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit a750ec80f34e1da581ecfd9fa32c7637b22590e0
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 19:38:41 2010 +0000

    2010-07-21  Tony Gentilcore  <tonyg at chromium.org>
    
            Unreviewed build fix.
    
            Disable overzealous ASSERT
            https://bugs.webkit.org/show_bug.cgi?id=42775
    
            No new tests because no changed functionality.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::stopLoading):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63849 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 88874ea..4017101 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-21  Tony Gentilcore  <tonyg at chromium.org>
+
+        Unreviewed build fix.
+
+        Disable overzealous ASSERT
+        https://bugs.webkit.org/show_bug.cgi?id=42775
+
+        No new tests because no changed functionality.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading):
+
 2010-07-21  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index bfa08f0..4d50ec0 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -451,7 +451,8 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic
                         if (m_provisionalDocumentLoader) {
                             DocumentLoadTiming* timing = m_provisionalDocumentLoader->timing();
                             ASSERT(timing->navigationStart);
-                            ASSERT(!timing->unloadEventEnd);
+                            // FIXME: This fails in Safari (https://bugs.webkit.org/show_bug.cgi?id=42772). Understand why.
+                            // ASSERT(!timing->unloadEventEnd);
                             timing->unloadEventEnd = currentTime();
                             ASSERT(timing->unloadEventEnd >= timing->navigationStart);
                         }

-- 
WebKit Debian packaging