Skip to content
Permalink
Browse files
2010-07-19 Tony Gentilcore <tonyg@chromium.org>
        Unreviewed build fix.

        Remove overzealous ASSERT from r63689
        https://bugs.webkit.org/show_bug.cgi?id=42606

        No new tests because no new functionality.

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::stopLoading):

Canonical link: https://commits.webkit.org/54537@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63699 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
tonygentilcore committed Jul 19, 2010
1 parent b7480f0 commit c4bd7127b6b9adf8af8a2213881538ef729fb18a
Showing with 14 additions and 1 deletion.
  1. +12 −0 WebCore/ChangeLog
  2. +2 −1 WebCore/loader/FrameLoader.cpp
@@ -1,3 +1,15 @@
2010-07-19 Tony Gentilcore <tonyg@chromium.org>

Unreviewed build fix.

Remove overzealous ASSERT from r63689
https://bugs.webkit.org/show_bug.cgi?id=42606

No new tests because no new functionality.

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopLoading):

2010-07-19 Joseph Pecoraro <joepeck@webkit.org>

Reviewed by Mark Rowe.
@@ -452,7 +452,8 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic
if (m_provisionalDocumentLoader) {
DocumentLoadTiming* timing = m_provisionalDocumentLoader->timing();
ASSERT(timing->navigationStart);
ASSERT(!timing->unloadEventEnd);
// FIXME: This fails. Understand why.
// ASSERT(!timing->unloadEventEnd);
timing->unloadEventEnd = currentTime();
ASSERT(timing->unloadEventEnd >= timing->navigationStart);
}

0 comments on commit c4bd712

Please sign in to comment.