Changeset 64939 in webkit

Timestamp:

Aug 7, 2010 11:19:48 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-08-07 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

WebTiming does not take page cache into account
​https://bugs.webkit.org/show_bug.cgi?id=42772

Adds tests that simulates flow from a page that's in the page cache to
one that's not, and then back to the page cached page (where the
DocumentLoader is reused, but we should have a new DocumentLoadTiming
struct).

• fast/events/onunload-back-to-page-cache-expected.txt: Added.
• fast/events/onunload-back-to-page-cache.html: Added.

2010-08-07 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

WebTiming does not take page cache into account
​https://bugs.webkit.org/show_bug.cgi?id=42772

When restoring a page from the page cache, reset its DocumentLoadTiming
struct and record navigationStart.

Test: fast/events/onunload-back-to-page-cache.html

• loader/DocumentLoadTiming.h: removed Noncopyable, since it's just a simple struct.
• loader/DocumentLoader.h: (WebCore::DocumentLoader::resetTiming): Added method.
• loader/FrameLoader.cpp: (WebCore::FrameLoader::stopLoading): Uncommented assert. (WebCore::FrameLoader::loadProvisionalItemFromCachedPage): Added resetTiming() call.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/onunload-back-to-page-cache-expected.txt (added)
• LayoutTests/fast/events/onunload-back-to-page-cache.html (added)
• LayoutTests/fast/events/script-tests/onunload-back-to-page-cache.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/DocumentLoadTiming.h (modified) (1 diff)
• WebCore/loader/DocumentLoader.h (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-07  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        WebTiming does not take page cache into account
+        https://bugs.webkit.org/show_bug.cgi?id=42772
+        
+        Adds tests that simulates flow from a page that's in the page cache to
+        one that's not, and then back to the page cached page (where the
+        DocumentLoader is reused, but we should have a new DocumentLoadTiming
+        struct).
+
+        * fast/events/onunload-back-to-page-cache-expected.txt: Added.
+        * fast/events/onunload-back-to-page-cache.html: Added.
+
 2010-08-07  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-07  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        WebTiming does not take page cache into account
+        https://bugs.webkit.org/show_bug.cgi?id=42772
+
+        When restoring a page from the page cache, reset its DocumentLoadTiming
+        struct and record navigationStart.
+    
+        Test: fast/events/onunload-back-to-page-cache.html
+
+        * loader/DocumentLoadTiming.h: removed Noncopyable, since it's just a simple struct.
+        * loader/DocumentLoader.h:
+        (WebCore::DocumentLoader::resetTiming): Added method.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading): Uncommented assert.
+        (WebCore::FrameLoader::loadProvisionalItemFromCachedPage): Added resetTiming() call.
+
 2010-08-07  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/WebCore/loader/DocumentLoadTiming.h

@@ -27 +27 @@
 #define DocumentLoadTiming_h
 
-#include <wtf/Noncopyable.h>
-
 namespace WebCore {
 
-struct DocumentLoadTiming : public Noncopyable {
+struct DocumentLoadTiming {
     DocumentLoadTiming()
         : navigationStart(0.0)

trunk/WebCore/loader/DocumentLoader.h

@@ -208 +208 @@
 
         DocumentLoadTiming* timing() { return &m_documentLoadTiming; }
+        void resetTiming() { m_documentLoadTiming = DocumentLoadTiming(); }
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)

trunk/WebCore/loader/FrameLoader.cpp

@@ -454 +454 @@
                             DocumentLoadTiming* timing = m_provisionalDocumentLoader->timing();
                             ASSERT(timing->navigationStart);
-                            // FIXME: This fails in Safari (https://bugs.webkit.org/show_bug.cgi?id=42772). Understand why.
-                            // ASSERT(!timing->unloadEventEnd);
+                            ASSERT(!timing->unloadEventEnd);
                             timing->unloadEventEnd = currentTime();
                             ASSERT(timing->unloadEventEnd >= timing->navigationStart);
@@ -3145 +3144 @@
 
     m_loadingFromCachedPage = true;
+    
+    // Should have timing data from previous time(s) the page was shown.
+    ASSERT(provisionalLoader->timing()->navigationStart);
+    provisionalLoader->resetTiming();
+    provisionalLoader->timing()->navigationStart = currentTime();    
 
     provisionalLoader->setCommitted(true);