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 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1188 newLoadType, false, request.triggeringEvent())); | 1188 newLoadType, false, request.triggeringEvent())); |
1189 if (shouldTreatURLAsSameAsCurrent(url)) | 1189 if (shouldTreatURLAsSameAsCurrent(url)) |
1190 newLoadType = FrameLoadTypeReplaceCurrentItem; | 1190 newLoadType = FrameLoadTypeReplaceCurrentItem; |
1191 } | 1191 } |
1192 | 1192 |
1193 loadInSameDocument(url, stateObject, newLoadType, historyLoadType, | 1193 loadInSameDocument(url, stateObject, newLoadType, historyLoadType, |
1194 request.clientRedirect(), request.originDocument()); | 1194 request.clientRedirect(), request.originDocument()); |
1195 return; | 1195 return; |
1196 } | 1196 } |
1197 | 1197 |
| 1198 // PlzNavigate |
| 1199 // If the loader classifies this navigation as a different document navigation |
| 1200 // while the browser intended the navigation to be same-document, it means |
| 1201 // that a different navigation must have committed while the IPC was sent. |
| 1202 // This navigation is no more same-document. The navigation is simply dropped. |
| 1203 if (request.resourceRequest().isSameDocumentNavigation()) |
| 1204 return; |
| 1205 |
1198 startLoad(request, newLoadType, policy); | 1206 startLoad(request, newLoadType, policy); |
1199 } | 1207 } |
1200 | 1208 |
1201 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) { | 1209 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) { |
1202 if (!shouldTreatURLAsSrcdocDocument(url)) | 1210 if (!shouldTreatURLAsSrcdocDocument(url)) |
1203 return SubstituteData(); | 1211 return SubstituteData(); |
1204 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr); | 1212 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr); |
1205 DCHECK(!srcdoc.isNull()); | 1213 DCHECK(!srcdoc.isNull()); |
1206 CString encodedSrcdoc = srcdoc.utf8(); | 1214 CString encodedSrcdoc = srcdoc.utf8(); |
1207 return SubstituteData( | 1215 return SubstituteData( |
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1997 frameLoadRequest.clientRedirect()); | 2005 frameLoadRequest.clientRedirect()); |
1998 | 2006 |
1999 loader->setLoadType(loadType); | 2007 loader->setLoadType(loadType); |
2000 loader->setNavigationType(navigationType); | 2008 loader->setNavigationType(navigationType); |
2001 loader->setReplacesCurrentHistoryItem(loadType == | 2009 loader->setReplacesCurrentHistoryItem(loadType == |
2002 FrameLoadTypeReplaceCurrentItem); | 2010 FrameLoadTypeReplaceCurrentItem); |
2003 return loader; | 2011 return loader; |
2004 } | 2012 } |
2005 | 2013 |
2006 } // namespace blink | 2014 } // namespace blink |
OLD | NEW |