Chromium Code Reviews| Index: third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
| diff --git a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
| index 70e1d4193b6451c383b0ad4d3b1dadbcb9cc1f02..cb4931eeecff63936cd0d044d2734e410f93382f 100644 |
| --- a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
| +++ b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
| @@ -75,13 +75,18 @@ void WebDataSourceImpl::appendRedirect(const WebURL& url) |
| DocumentLoader::appendRedirect(url); |
| } |
| -void WebDataSourceImpl::updateNavigationTimings(double redirectStartTime, double redirectEndTime, double fetchStartTime, const WebVector<WebURL>& redirectChain) |
| +void WebDataSourceImpl::updateNavigation(double redirectStartTime, double redirectEndTime, double fetchStartTime, const WebVector<WebURL>& redirectChain) |
|
Charlie Reis
2016/08/09 05:07:31
It's not clear to me whether this is the right pla
arthursonzogni
2016/08/10 10:02:24
See another reply above.
|
| { |
| for (size_t i = 0; i + 1 < redirectChain.size(); ++i) |
| timing().addRedirect(redirectChain[i], redirectChain[i + 1]); |
| timing().setRedirectStart(redirectStartTime); |
| timing().setRedirectEnd(redirectEndTime); |
| timing().setFetchStart(fetchStartTime); |
| + |
| + // If a redirection happens during a back/forward navigation, don't reuse |
| + // any state from the previous HistoryItem |
|
Charlie Reis
2016/08/09 05:07:31
nit: End comment sentences with a period.
arthursonzogni
2016/08/10 10:02:24
Done.
|
| + if (redirectChain.size() >= 2) |
|
nasko
2016/08/03 16:31:25
How do we know this is a back/forward navigation h
arthursonzogni
2016/08/04 14:04:53
Yes it is. But from what I understood, m_provision
Charlie Reis
2016/08/09 05:07:31
Right. That seems consistent with how FrameLoader
|
| + discardProvisionalHistoryItem(); |
| } |
| void WebDataSourceImpl::redirectChain(WebVector<WebURL>& result) const |