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

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

Issue 2584513003: PlzNavigate: identify same-page browser-initiated navigation. (Closed)
Patch Set: Allow renderer-initiated reloads. 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 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 newLoadType, false, request.triggeringEvent())); 1185 newLoadType, false, request.triggeringEvent()));
1186 if (shouldTreatURLAsSameAsCurrent(url)) 1186 if (shouldTreatURLAsSameAsCurrent(url))
1187 newLoadType = FrameLoadTypeReplaceCurrentItem; 1187 newLoadType = FrameLoadTypeReplaceCurrentItem;
1188 } 1188 }
1189 1189
1190 loadInSameDocument(url, stateObject, newLoadType, historyLoadType, 1190 loadInSameDocument(url, stateObject, newLoadType, historyLoadType,
1191 request.clientRedirect(), request.originDocument()); 1191 request.clientRedirect(), request.originDocument());
1192 return; 1192 return;
1193 } 1193 }
1194 1194
1195 // PlzNavigate
1196 // If the loader classifies this navigation as a different document navigation
1197 // while the browser intended the navigation to be same-document, it means
1198 // that a different navigation must have committed while the IPC was sent.
1199 // This navigation is no more same-document. The navigation is simply dropped.
1200 if (request.resourceRequest().isSameDocumentNavigation())
1201 return;
1202
1195 startLoad(request, newLoadType, policy); 1203 startLoad(request, newLoadType, policy);
1196 } 1204 }
1197 1205
1198 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) { 1206 SubstituteData FrameLoader::defaultSubstituteDataForURL(const KURL& url) {
1199 if (!shouldTreatURLAsSrcdocDocument(url)) 1207 if (!shouldTreatURLAsSrcdocDocument(url))
1200 return SubstituteData(); 1208 return SubstituteData();
1201 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr); 1209 String srcdoc = m_frame->deprecatedLocalOwner()->fastGetAttribute(srcdocAttr);
1202 DCHECK(!srcdoc.isNull()); 1210 DCHECK(!srcdoc.isNull());
1203 CString encodedSrcdoc = srcdoc.utf8(); 1211 CString encodedSrcdoc = srcdoc.utf8();
1204 return SubstituteData( 1212 return SubstituteData(
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1905 m_documentLoader ? m_documentLoader->url() : String()); 1913 m_documentLoader ? m_documentLoader->url() : String());
1906 return tracedValue; 1914 return tracedValue;
1907 } 1915 }
1908 1916
1909 inline void FrameLoader::takeObjectSnapshot() const { 1917 inline void FrameLoader::takeObjectSnapshot() const {
1910 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1918 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1911 toTracedValue()); 1919 toTracedValue());
1912 } 1920 }
1913 1921
1914 } // namespace blink 1922 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698