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

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

Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType (Closed)
Patch Set: More compile fixes Created 3 years, 10 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 const SubstituteData& substituteData, 101 const SubstituteData& substituteData,
102 ClientRedirectPolicy clientRedirectPolicy) 102 ClientRedirectPolicy clientRedirectPolicy)
103 : m_frame(frame), 103 : m_frame(frame),
104 m_fetcher(FrameFetchContext::createFetcherFromDocumentLoader(this)), 104 m_fetcher(FrameFetchContext::createFetcherFromDocumentLoader(this)),
105 m_originalRequest(req), 105 m_originalRequest(req),
106 m_substituteData(substituteData), 106 m_substituteData(substituteData),
107 m_request(req), 107 m_request(req),
108 m_loadType(FrameLoadTypeStandard), 108 m_loadType(FrameLoadTypeStandard),
109 m_isClientRedirect(clientRedirectPolicy == 109 m_isClientRedirect(clientRedirectPolicy ==
110 ClientRedirectPolicy::ClientRedirect), 110 ClientRedirectPolicy::ClientRedirect),
111 m_replacesCurrentHistoryItem(false),
112 m_dataReceived(false), 111 m_dataReceived(false),
113 m_navigationType(NavigationTypeOther),
114 m_documentLoadTiming(*this), 112 m_documentLoadTiming(*this),
115 m_timeOfLastDataReceived(0.0), 113 m_timeOfLastDataReceived(0.0),
116 m_applicationCacheHost(ApplicationCacheHost::create(this)), 114 m_applicationCacheHost(ApplicationCacheHost::create(this)),
117 m_wasBlockedAfterCSP(false), 115 m_wasBlockedAfterCSP(false),
118 m_state(NotStarted), 116 m_state(NotStarted),
119 m_inDataReceived(false), 117 m_inDataReceived(false),
120 m_dataBuffer(SharedBuffer::create()) { 118 m_dataBuffer(SharedBuffer::create()) {
121 DCHECK(m_frame); 119 DCHECK(m_frame);
122 120
123 // The document URL needs to be added to the head of the list as that is 121 // The document URL needs to be added to the head of the list as that is
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 const KURL& requestURL = m_request.url(); 367 const KURL& requestURL = m_request.url();
370 RefPtr<SecurityOrigin> redirectingOrigin = 368 RefPtr<SecurityOrigin> redirectingOrigin =
371 SecurityOrigin::create(redirectResponse.url()); 369 SecurityOrigin::create(redirectResponse.url());
372 if (!redirectingOrigin->canDisplay(requestURL)) { 370 if (!redirectingOrigin->canDisplay(requestURL)) {
373 FrameLoader::reportLocalLoadFailed(m_frame, requestURL.getString()); 371 FrameLoader::reportLocalLoadFailed(m_frame, requestURL.getString());
374 m_fetcher->stopFetching(); 372 m_fetcher->stopFetching();
375 return false; 373 return false;
376 } 374 }
377 if (!frameLoader().shouldContinueForNavigationPolicy( 375 if (!frameLoader().shouldContinueForNavigationPolicy(
378 m_request, SubstituteData(), this, CheckContentSecurityPolicy, 376 m_request, SubstituteData(), this, CheckContentSecurityPolicy,
379 m_navigationType, NavigationPolicyCurrentTab, m_loadType, 377 NavigationPolicyCurrentTab, m_loadType, isClientRedirect(),
380 isClientRedirect(), nullptr)) { 378 nullptr)) {
381 m_fetcher->stopFetching(); 379 m_fetcher->stopFetching();
382 return false; 380 return false;
383 } 381 }
384 382
385 DCHECK(timing().fetchStart()); 383 DCHECK(timing().fetchStart());
386 appendRedirect(requestURL); 384 appendRedirect(requestURL);
387 didRedirect(redirectResponse.url(), requestURL); 385 didRedirect(redirectResponse.url(), requestURL);
388 frameLoaderClient().dispatchDidReceiveServerRedirectForProvisionalLoad(); 386 frameLoaderClient().dispatchDidReceiveServerRedirectForProvisionalLoad();
389 387
390 return true; 388 return true;
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 m_writer ? m_writer->encoding() : emptyAtom, true, 812 m_writer ? m_writer->encoding() : emptyAtom, true,
815 ForceSynchronousParsing); 813 ForceSynchronousParsing);
816 if (!source.isNull()) 814 if (!source.isNull())
817 m_writer->appendReplacingData(source); 815 m_writer->appendReplacingData(source);
818 endWriting(); 816 endWriting();
819 } 817 }
820 818
821 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); 819 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
822 820
823 } // namespace blink 821 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentLoader.h ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698