2010-07-21 Tony Gentilcore <tonyg@chromium.org>

tonygentilcore · tonygentilcore · commit 6ceda086b398 · 2010-07-21T19:38:41.000Z
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): Canonical link: https://commits.webkit.org/54686@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-21  Tony Gentilcore  <tonyg@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@nokia.com>
 
         Reviewed by Darin Adler.
diff --git 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);
                         }
