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