Changeset 63707 in webkit

Timestamp:

Jul 19, 2010 7:37:01 PM (14 years ago)

Author:

tonyg@chromium.org

Message:

2010-07-19 Tony Gentilcore <​tonyg@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-19  Tony Gentilcore  <tonyg@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@nokia.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -448 +448 @@
                     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);
+                        }
                     }
                 }