[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 ed0759ed22643afb88b7bcf141882746cc18116f
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 02:37:01 2010 +0000

    2010-07-19  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Only set unloadEventEnd when the unload event is actually fired
            https://bugs.webkit.org/show_bug.cgi?id=42607
    
            r63689 introduced this ASSERT and it began failing on Qt and Mac debug.
            For some reason, it did not fail on Windows (which is where I was
            testing). The ASSERT was disabled in r63699.
    
            Test: page-cache related layout tests don't crash in debug mode on Mac.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::stopLoading):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63707 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8b782ab..43c745f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-19  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Only set unloadEventEnd when the unload event is actually fired
+        https://bugs.webkit.org/show_bug.cgi?id=42607
+
+        r63689 introduced this ASSERT and it began failing on Qt and Mac debug.
+        For some reason, it did not fail on Windows (which is where I was
+        testing). The ASSERT was disabled in r63699.
+
+        Test: page-cache related layout tests don't crash in debug mode on Mac.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading):
+
 2010-07-19  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 7d960cd..d360236 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -447,15 +447,16 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic
                 if (m_frame->domWindow()) {
                     if (unloadEventPolicy == UnloadEventPolicyUnloadAndPageHide)
                         m_frame->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, m_frame->document()->inPageCache()), m_frame->document());
-                    if (!m_frame->document()->inPageCache())
+                    if (!m_frame->document()->inPageCache()) {
                         m_frame->domWindow()->dispatchEvent(Event::create(eventNames().unloadEvent, false, false), m_frame->domWindow()->document());
-                    if (m_provisionalDocumentLoader) {
-                        DocumentLoadTiming* timing = m_provisionalDocumentLoader->timing();
-                        ASSERT(timing->navigationStart);
-                        // FIXME: This fails. Understand why.
-                        // ASSERT(!timing->unloadEventEnd);
-                        timing->unloadEventEnd = currentTime();
-                        ASSERT(timing->unloadEventEnd >= timing->navigationStart);
+
+                        if (m_provisionalDocumentLoader) {
+                            DocumentLoadTiming* timing = m_provisionalDocumentLoader->timing();
+                            ASSERT(timing->navigationStart);
+                            ASSERT(!timing->unloadEventEnd);
+                            timing->unloadEventEnd = currentTime();
+                            ASSERT(timing->unloadEventEnd >= timing->navigationStart);
+                        }
                     }
                 }
                 m_pageDismissalEventBeingDispatched = false;

-- 
WebKit Debian packaging