Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 }; | 146 }; |
| 147 InitialScrollState& initialScrollState() { return m_initialScrollState; } | 147 InitialScrollState& initialScrollState() { return m_initialScrollState; } |
| 148 | 148 |
| 149 void setWasBlockedAfterXFrameOptionsOrCSP() { m_wasBlockedAfterXFrameOptions OrCSP = true; } | 149 void setWasBlockedAfterXFrameOptionsOrCSP() { m_wasBlockedAfterXFrameOptions OrCSP = true; } |
| 150 bool wasBlockedAfterXFrameOptionsOrCSP() { return m_wasBlockedAfterXFrameOpt ionsOrCSP; } | 150 bool wasBlockedAfterXFrameOptionsOrCSP() { return m_wasBlockedAfterXFrameOpt ionsOrCSP; } |
| 151 | 151 |
| 152 void dispatchLinkHeaderPreloads(ViewportDescriptionWrapper*, LinkLoader::Med iaPreloadPolicy); | 152 void dispatchLinkHeaderPreloads(ViewportDescriptionWrapper*, LinkLoader::Med iaPreloadPolicy); |
| 153 | 153 |
| 154 Resource* startPreload(Resource::Type, FetchRequest&); | 154 Resource* startPreload(Resource::Type, FetchRequest&); |
| 155 | 155 |
| 156 // Declare a redirection that happened outside of the document loader, | |
| 157 // before its instantiation. | |
| 158 void didRedirect(const KURL& oldURL, const KURL& newURL); | |
|
Nate Chapin
2016/08/18 16:49:57
Sorry, missed this earlier, should this be protect
arthursonzogni
2016/08/19 08:20:30
Yes, you are right.
I also removed the comment say
| |
| 159 | |
| 156 DECLARE_VIRTUAL_TRACE(); | 160 DECLARE_VIRTUAL_TRACE(); |
| 157 | 161 |
| 158 protected: | 162 protected: |
| 159 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); | 163 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); |
| 160 | 164 |
| 161 Vector<KURL> m_redirectChain; | 165 Vector<KURL> m_redirectChain; |
| 162 | 166 |
| 163 private: | 167 private: |
| 164 static DocumentWriter* createWriterFor(const DocumentInit&, const AtomicStri ng& mimeType, const AtomicString& encoding, bool dispatchWindowObjectAvailable, ParserSynchronizationPolicy, const KURL& overridingURL = KURL()); | 168 static DocumentWriter* createWriterFor(const DocumentInit&, const AtomicStri ng& mimeType, const AtomicString& encoding, bool dispatchWindowObjectAvailable, ParserSynchronizationPolicy, const KURL& overridingURL = KURL()); |
| 165 | 169 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 // Used to protect against reentrancy into dataReceived(). | 246 // Used to protect against reentrancy into dataReceived(). |
| 243 bool m_inDataReceived; | 247 bool m_inDataReceived; |
| 244 RefPtr<SharedBuffer> m_dataBuffer; | 248 RefPtr<SharedBuffer> m_dataBuffer; |
| 245 }; | 249 }; |
| 246 | 250 |
| 247 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 251 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 248 | 252 |
| 249 } // namespace blink | 253 } // namespace blink |
| 250 | 254 |
| 251 #endif // DocumentLoader_h | 255 #endif // DocumentLoader_h |
| OLD | NEW |