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

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

Issue 2109633002: Executed HTTPS upgrade before notifying the start of the provisional load. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified cross site URL code. Created 4 years, 5 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_repl acesCurrentHistoryItem = replacesCurrentHistoryItem; } 106 void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_repl acesCurrentHistoryItem = replacesCurrentHistoryItem; }
107 107
108 bool isCommittedButEmpty() const { return m_state == Committed; } 108 bool isCommittedButEmpty() const { return m_state == Committed; }
109 109
110 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; } 110 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }
111 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; } 111 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }
112 112
113 NavigationType getNavigationType() const { return m_navigationType; } 113 NavigationType getNavigationType() const { return m_navigationType; }
114 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; } 114 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; }
115 115
116 void upgradeInsecureRequest();
117
116 void startLoadingMainResource(); 118 void startLoadingMainResource();
117 119
118 void acceptDataFromThreadedReceiver(const char* data, int dataLength, int en codedDataLength); 120 void acceptDataFromThreadedReceiver(const char* data, int dataLength, int en codedDataLength);
119 DocumentLoadTiming& timing() { return m_documentLoadTiming; } 121 DocumentLoadTiming& timing() { return m_documentLoadTiming; }
120 const DocumentLoadTiming& timing() const { return m_documentLoadTiming; } 122 const DocumentLoadTiming& timing() const { return m_documentLoadTiming; }
121 123
122 ApplicationCacheHost* applicationCacheHost() const { return m_applicationCac heHost.get(); } 124 ApplicationCacheHost* applicationCacheHost() const { return m_applicationCac heHost.get(); }
123 125
124 void clearRedirectChain(); 126 void clearRedirectChain();
125 void appendRedirect(const KURL&); 127 void appendRedirect(const KURL&);
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 // Used to protect against reentrancy into dataReceived(). 237 // Used to protect against reentrancy into dataReceived().
236 bool m_inDataReceived; 238 bool m_inDataReceived;
237 RefPtr<SharedBuffer> m_dataBuffer; 239 RefPtr<SharedBuffer> m_dataBuffer;
238 }; 240 };
239 241
240 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 242 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
241 243
242 } // namespace blink 244 } // namespace blink
243 245
244 #endif // DocumentLoader_h 246 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698