| 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 : wasScrolledByUser(false) | 134 : wasScrolledByUser(false) |
| 135 , didRestoreFromHistory(false) | 135 , didRestoreFromHistory(false) |
| 136 { | 136 { |
| 137 } | 137 } |
| 138 | 138 |
| 139 bool wasScrolledByUser; | 139 bool wasScrolledByUser; |
| 140 bool didRestoreFromHistory; | 140 bool didRestoreFromHistory; |
| 141 }; | 141 }; |
| 142 InitialScrollState& initialScrollState() { return m_initialScrollState; } | 142 InitialScrollState& initialScrollState() { return m_initialScrollState; } |
| 143 | 143 |
| 144 void setWasBlockedAfterXFrameOptionsOrCSP() { m_wasBlockedAfterXFrameOptions
OrCSP = true; } |
| 145 bool wasBlockedAfterXFrameOptionsOrCSP() { return m_wasBlockedAfterXFrameOpt
ionsOrCSP; } |
| 146 |
| 144 bool loadingMultipartContent() const; | 147 bool loadingMultipartContent() const; |
| 145 | 148 |
| 146 Resource* startPreload(Resource::Type, FetchRequest&); | 149 Resource* startPreload(Resource::Type, FetchRequest&); |
| 147 | 150 |
| 148 DECLARE_VIRTUAL_TRACE(); | 151 DECLARE_VIRTUAL_TRACE(); |
| 149 | 152 |
| 150 protected: | 153 protected: |
| 151 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); | 154 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); |
| 152 | 155 |
| 153 Vector<KURL> m_redirectChain; | 156 Vector<KURL> m_redirectChain; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 DocumentLoadTiming m_documentLoadTiming; | 217 DocumentLoadTiming m_documentLoadTiming; |
| 215 | 218 |
| 216 double m_timeOfLastDataReceived; | 219 double m_timeOfLastDataReceived; |
| 217 | 220 |
| 218 PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost; | 221 PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost; |
| 219 | 222 |
| 220 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy; | 223 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy; |
| 221 ClientHintsPreferences m_clientHintsPreferences; | 224 ClientHintsPreferences m_clientHintsPreferences; |
| 222 InitialScrollState m_initialScrollState; | 225 InitialScrollState m_initialScrollState; |
| 223 | 226 |
| 227 bool m_wasBlockedAfterXFrameOptionsOrCSP; |
| 228 |
| 224 enum State { | 229 enum State { |
| 225 NotStarted, | 230 NotStarted, |
| 226 Provisional, | 231 Provisional, |
| 227 Committed, | 232 Committed, |
| 228 DataReceived, | 233 DataReceived, |
| 229 MainResourceDone, | 234 MainResourceDone, |
| 230 SentDidFinishLoad | 235 SentDidFinishLoad |
| 231 }; | 236 }; |
| 232 State m_state; | 237 State m_state; |
| 233 | 238 |
| 234 // Used to protect against reentrancy into dataReceived(). | 239 // Used to protect against reentrancy into dataReceived(). |
| 235 bool m_inDataReceived; | 240 bool m_inDataReceived; |
| 236 RefPtr<SharedBuffer> m_dataBuffer; | 241 RefPtr<SharedBuffer> m_dataBuffer; |
| 237 }; | 242 }; |
| 238 | 243 |
| 239 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 244 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 240 | 245 |
| 241 } // namespace blink | 246 } // namespace blink |
| 242 | 247 |
| 243 #endif // DocumentLoader_h | 248 #endif // DocumentLoader_h |
| OLD | NEW |