| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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; } | 144 void setWasBlockedAfterXFrameOptionsOrCSP() { m_wasBlockedAfterXFrameOptions
OrCSP = true; } |
| 145 bool wasBlockedAfterXFrameOptionsOrCSP() { return m_wasBlockedAfterXFrameOpt
ionsOrCSP; } | 145 bool wasBlockedAfterXFrameOptionsOrCSP() { return m_wasBlockedAfterXFrameOpt
ionsOrCSP; } |
| 146 | 146 |
| 147 bool loadingMultipartContent() const; | |
| 148 | |
| 149 Resource* startPreload(Resource::Type, FetchRequest&); | 147 Resource* startPreload(Resource::Type, FetchRequest&); |
| 150 | 148 |
| 151 DECLARE_VIRTUAL_TRACE(); | 149 DECLARE_VIRTUAL_TRACE(); |
| 152 | 150 |
| 153 protected: | 151 protected: |
| 154 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); | 152 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); |
| 155 | 153 |
| 156 Vector<KURL> m_redirectChain; | 154 Vector<KURL> m_redirectChain; |
| 157 | 155 |
| 158 private: | 156 private: |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 // Used to protect against reentrancy into dataReceived(). | 237 // Used to protect against reentrancy into dataReceived(). |
| 240 bool m_inDataReceived; | 238 bool m_inDataReceived; |
| 241 RefPtr<SharedBuffer> m_dataBuffer; | 239 RefPtr<SharedBuffer> m_dataBuffer; |
| 242 }; | 240 }; |
| 243 | 241 |
| 244 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 242 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 245 | 243 |
| 246 } // namespace blink | 244 } // namespace blink |
| 247 | 245 |
| 248 #endif // DocumentLoader_h | 246 #endif // DocumentLoader_h |
| OLD | NEW |