OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
3 * reserved. | 3 * reserved. |
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
6 * (http://www.torchmobile.com/) | 6 * (http://www.torchmobile.com/) |
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
10 * Copyright (C) 2011 Google Inc. All rights reserved. | 10 * Copyright (C) 2011 Google Inc. All rights reserved. |
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1176 newLoadType, false, request.triggeringEvent())); | 1176 newLoadType, false, request.triggeringEvent())); |
1177 if (shouldTreatURLAsSameAsCurrent(url)) | 1177 if (shouldTreatURLAsSameAsCurrent(url)) |
1178 newLoadType = FrameLoadTypeReplaceCurrentItem; | 1178 newLoadType = FrameLoadTypeReplaceCurrentItem; |
1179 } | 1179 } |
1180 | 1180 |
1181 loadInSameDocument(url, stateObject, newLoadType, historyLoadType, | 1181 loadInSameDocument(url, stateObject, newLoadType, historyLoadType, |
1182 request.clientRedirect(), request.originDocument()); | 1182 request.clientRedirect(), request.originDocument()); |
1183 return; | 1183 return; |
1184 } | 1184 } |
1185 | 1185 |
1186 // The navigation has not been detected to be same document. If the request | |
1187 // was declared to be, it means that a renderer-side navigation occurs in | |
1188 // between. In that case, this navigation is dropped. | |
clamy
2016/12/20 15:16:22
Can you prefix the comment with // PlzNavigate ?
I
arthursonzogni
2016/12/21 10:11:08
Done.
| |
1189 if (request.resourceRequest().isSameDocumentNavigation()) | |
1190 return; | |
1191 | |
1186 startLoad(request, newLoadType, policy); | 1192 startLoad(request, newLoadType, policy); |
1187 } | 1193 } |
1188 | 1194 |
1189 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) { | 1195 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) { |
1190 if (!shouldTreatURLAsSrcdocDocument(url)) | 1196 if (!shouldTreatURLAsSrcdocDocument(url)) |
1191 return SubstituteData(); | 1197 return SubstituteData(); |
1192 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr); | 1198 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr); |
1193 DCHECK(!srcdoc.isNull()); | 1199 DCHECK(!srcdoc.isNull()); |
1194 CString encodedSrcdoc = srcdoc.utf8(); | 1200 CString encodedSrcdoc = srcdoc.utf8(); |
1195 return SubstituteData( | 1201 return SubstituteData( |
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1959 m_documentLoader ? m_documentLoader->url() : String()); | 1965 m_documentLoader ? m_documentLoader->url() : String()); |
1960 return tracedValue; | 1966 return tracedValue; |
1961 } | 1967 } |
1962 | 1968 |
1963 inline void FrameLoader::takeObjectSnapshot() const { | 1969 inline void FrameLoader::takeObjectSnapshot() const { |
1964 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1970 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
1965 toTracedValue()); | 1971 toTracedValue()); |
1966 } | 1972 } |
1967 | 1973 |
1968 } // namespace blink | 1974 } // namespace blink |
OLD | NEW |