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

[simonjam at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 401fb7c14c86e1b460ddbfdd9fc49007b2fbc1af
Author: simonjam at chromium.org <simonjam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 02:57:35 2011 +0000

    2011-02-01  James Simonsen  <simonjam at chromium.org>
    
            Reviewed by Tony Gentilcore.
    
            [WebTiming] Remove asserts that verify timestamp order
            https://bugs.webkit.org/show_bug.cgi?id=53548
    
            Covered by existing tests.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::stopLoading): Remove assert.
            * page/DOMWindow.cpp:
            (WebCore::DOMWindow::dispatchTimedEvent): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77357 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4612edb..bcd22c4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-01  James Simonsen  <simonjam at chromium.org>
+
+        Reviewed by Tony Gentilcore.
+
+        [WebTiming] Remove asserts that verify timestamp order
+        https://bugs.webkit.org/show_bug.cgi?id=53548
+
+        Covered by existing tests.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading): Remove assert.
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::dispatchTimedEvent): Ditto.
+
 2011-02-01  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Add the 'default_targets' enclosure to the flags.
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 8db743b..48ba648 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -385,7 +385,6 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic
                             DocumentLoadTiming* timing = documentLoader->timing();
                             ASSERT(timing->navigationStart);
                             m_frame->domWindow()->dispatchTimedEvent(unloadEvent, m_frame->domWindow()->document(), &timing->unloadEventStart, &timing->unloadEventEnd);
-                            ASSERT(timing->unloadEventStart >= timing->navigationStart);
                         } else
                             m_frame->domWindow()->dispatchEvent(unloadEvent, m_frame->domWindow()->document());
                     }
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index 0e373e5..575319b 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1553,7 +1553,6 @@ void DOMWindow::dispatchTimedEvent(PassRefPtr<Event> event, Document* target, do
     *startTime = currentTime();
     dispatchEvent(event, target);
     *endTime = currentTime();
-    ASSERT(*endTime >= *startTime);
 }
 
 void DOMWindow::removeAllEventListeners()

-- 
WebKit Debian packaging