| 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 void loadFailed(const ResourceError&); | 214 void loadFailed(const ResourceError&); |
| 215 | 215 |
| 216 DECLARE_VIRTUAL_TRACE(); | 216 DECLARE_VIRTUAL_TRACE(); |
| 217 | 217 |
| 218 protected: | 218 protected: |
| 219 DocumentLoader(LocalFrame*, | 219 DocumentLoader(LocalFrame*, |
| 220 const ResourceRequest&, | 220 const ResourceRequest&, |
| 221 const SubstituteData&, | 221 const SubstituteData&, |
| 222 ClientRedirectPolicy); | 222 ClientRedirectPolicy); |
| 223 | 223 |
| 224 static bool shouldClearWindowName(const LocalFrame&, |
| 225 SecurityOrigin* previousSecurityOrigin, |
| 226 const Document& newDocument); |
| 227 |
| 224 Vector<KURL> m_redirectChain; | 228 Vector<KURL> m_redirectChain; |
| 225 | 229 |
| 226 private: | 230 private: |
| 227 // installNewDocument() does the work of creating a Document and | 231 // installNewDocument() does the work of creating a Document and |
| 228 // DocumentWriter, as well as creating a new LocalDOMWindow if needed. It also | 232 // DocumentWriter, as well as creating a new LocalDOMWindow if needed. It also |
| 229 // initalizes a bunch of state on the Document (e.g., the state based on | 233 // initalizes a bunch of state on the Document (e.g., the state based on |
| 230 // response headers). | 234 // response headers). |
| 231 enum class InstallNewDocumentReason { kNavigation, kJavascriptURL }; | 235 enum class InstallNewDocumentReason { kNavigation, kJavascriptURL }; |
| 232 void installNewDocument(const DocumentInit&, | 236 void installNewDocument(const DocumentInit&, const AtomicString& mimeType, |
| 233 const AtomicString& mimeType, | |
| 234 const AtomicString& encoding, | 237 const AtomicString& encoding, |
| 235 InstallNewDocumentReason, | 238 InstallNewDocumentReason, ParserSynchronizationPolicy, |
| 236 ParserSynchronizationPolicy, | |
| 237 const KURL& overridingURL); | 239 const KURL& overridingURL); |
| 238 void didInstallNewDocument(Document*); | 240 void didInstallNewDocument(Document*); |
| 239 void didCommitNavigation(); | 241 void didCommitNavigation(); |
| 240 | 242 |
| 241 void ensureWriter(const AtomicString& mimeType, | 243 void ensureWriter(const AtomicString& mimeType, |
| 242 const KURL& overridingURL = KURL()); | 244 const KURL& overridingURL = KURL()); |
| 243 void endWriting(); | 245 void endWriting(); |
| 244 | 246 |
| 245 // Use these method only where it's guaranteed that |m_frame| hasn't been | 247 // Use these method only where it's guaranteed that |m_frame| hasn't been |
| 246 // cleared. | 248 // cleared. |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 // Used to protect against reentrancy into dataReceived(). | 350 // Used to protect against reentrancy into dataReceived(). |
| 349 bool m_inDataReceived; | 351 bool m_inDataReceived; |
| 350 RefPtr<SharedBuffer> m_dataBuffer; | 352 RefPtr<SharedBuffer> m_dataBuffer; |
| 351 }; | 353 }; |
| 352 | 354 |
| 353 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 355 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 354 | 356 |
| 355 } // namespace blink | 357 } // namespace blink |
| 356 | 358 |
| 357 #endif // DocumentLoader_h | 359 #endif // DocumentLoader_h |
| OLD | NEW |