Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2584513003: PlzNavigate: identify same-page browser-initiated navigation. (Closed)
Patch Set: Move IsFragmentAddedOrUpdated from net/ to url∕ Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 newLoadType, false, request.triggeringEvent())); 1186 newLoadType, false, request.triggeringEvent()));
1187 if (shouldTreatURLAsSameAsCurrent(url)) 1187 if (shouldTreatURLAsSameAsCurrent(url))
1188 newLoadType = FrameLoadTypeReplaceCurrentItem; 1188 newLoadType = FrameLoadTypeReplaceCurrentItem;
1189 } 1189 }
1190 1190
1191 loadInSameDocument(url, stateObject, newLoadType, historyLoadType, 1191 loadInSameDocument(url, stateObject, newLoadType, historyLoadType,
1192 request.clientRedirect(), request.originDocument()); 1192 request.clientRedirect(), request.originDocument());
1193 return; 1193 return;
1194 } 1194 }
1195 1195
1196 // PlzNavigate
1197 // If the loader classifies this navigation as a different document navigation
1198 // while the browser intended the navigation to be same-document, it means
1199 // that a different navigation must have committed while the IPC was sent.
1200 // This navigation is no more same-document. The navigation is simply dropped.
1201 if (request.resourceRequest().isSameDocumentNavigation())
1202 return;
1203
1196 startLoad(request, newLoadType, policy); 1204 startLoad(request, newLoadType, policy);
1197 } 1205 }
1198 1206
1199 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) { 1207 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) {
1200 if (!shouldTreatURLAsSrcdocDocument(url)) 1208 if (!shouldTreatURLAsSrcdocDocument(url))
1201 return SubstituteData(); 1209 return SubstituteData();
1202 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr); 1210 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr);
1203 DCHECK(!srcdoc.isNull()); 1211 DCHECK(!srcdoc.isNull());
1204 CString encodedSrcdoc = srcdoc.utf8(); 1212 CString encodedSrcdoc = srcdoc.utf8();
1205 return SubstituteData( 1213 return SubstituteData(
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1927 m_documentLoader ? m_documentLoader->url() : String()); 1935 m_documentLoader ? m_documentLoader->url() : String());
1928 return tracedValue; 1936 return tracedValue;
1929 } 1937 }
1930 1938
1931 inline void FrameLoader::takeObjectSnapshot() const { 1939 inline void FrameLoader::takeObjectSnapshot() const {
1932 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1940 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1933 toTracedValue()); 1941 toTracedValue());
1934 } 1942 }
1935 1943
1936 } // namespace blink 1944 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698