Changeset 109300 in webkit

Timestamp:

Feb 29, 2012 8:08:54 PM (12 years ago)

Author:

simonjam@chromium.org

Message:

[chromium] Fix navigation start time on cross-renderer navigation
​https://bugs.webkit.org/show_bug.cgi?id=75922

Reviewed by Darin Fisher.

Source/WebCore:

• loader/DocumentLoadTiming.cpp:

(WebCore::DocumentLoadTiming::setNavigationStart): Added.

• loader/DocumentLoadTiming.h:

Source/WebKit/chromium:

• public/WebDataSource.h:
• src/WebDataSource.cpp:

(WebKit::WebDataSource::setNavigationStartTime): Added.

• src/WebDataSource.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/DocumentLoadTiming.cpp (modified) (1 diff)
• WebCore/loader/DocumentLoadTiming.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebDataSource.h (modified) (1 diff)
• WebKit/chromium/src/WebDataSourceImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebDataSourceImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  James Simonsen  <simonjam@chromium.org>
+
+        [chromium] Fix navigation start time on cross-renderer navigation
+        https://bugs.webkit.org/show_bug.cgi?id=75922
+
+        Reviewed by Darin Fisher.
+
+        * loader/DocumentLoadTiming.cpp:
+        (WebCore::DocumentLoadTiming::setNavigationStart): Added.
+        * loader/DocumentLoadTiming.h:
+
 2012-02-29  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/loader/DocumentLoadTiming.cpp

@@ -73 +73 @@
 }
 
+void DocumentLoadTiming::setNavigationStart(double navigationStart)
+{
+    ASSERT(m_referenceMonotonicTime && m_referenceWallTime);
+    m_navigationStart = navigationStart;
+}
+
 void DocumentLoadTiming::addRedirect(const KURL& redirectingUrl, const KURL& redirectedUrl)
 {

trunk/Source/WebCore/loader/DocumentLoadTiming.h

@@ -39 +39 @@
 
     void markNavigationStart(Frame*);
+    void setNavigationStart(double);
     void addRedirect(const KURL& redirectingUrl, const KURL& redirectedUrl);
     double convertMonotonicTimeToDocumentTime(double monotonicTime) const;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-29  James Simonsen  <simonjam@chromium.org>
+
+        [chromium] Fix navigation start time on cross-renderer navigation
+        https://bugs.webkit.org/show_bug.cgi?id=75922
+
+        Reviewed by Darin Fisher.
+
+        * public/WebDataSource.h:
+        * src/WebDataSource.cpp:
+        (WebKit::WebDataSource::setNavigationStartTime): Added.
+        * src/WebDataSource.h:
+
 2012-02-29  Ian Vollick  <vollick@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebDataSource.h

@@ -104 +104 @@
     virtual void setDeferMainResourceDataLoad(bool) = 0;
 
+    // Sets the navigation start time for this datasource. Ordinarily,
+    // navigation start is determined in WebCore. But, in some situations,
+    // the embedder might have a better value and can override it here. This
+    // should be called before WebFrameClient::didCommitProvisionalLoad.
+    // Calling it later may confuse users, because JavaScript may have run and
+    // the user may have already recorded the original value.
+    virtual void setNavigationStartTime(double) = 0;
+
 protected:
     ~WebDataSource() { }

trunk/Source/WebKit/chromium/src/WebDataSourceImpl.cpp

@@ -130 +130 @@
 }
 
+void WebDataSourceImpl::setNavigationStartTime(double navigationStart)
+{
+    timing()->setNavigationStart(navigationStart);
+}
+
 WebNavigationType WebDataSourceImpl::toWebNavigationType(NavigationType type)
 {

trunk/Source/WebKit/chromium/src/WebDataSourceImpl.h

@@ -71 +71 @@
     virtual WebApplicationCacheHost* applicationCacheHost();
     virtual void setDeferMainResourceDataLoad(bool);
+    virtual void setNavigationStartTime(double);
 
     static WebNavigationType toWebNavigationType(WebCore::NavigationType type);