| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 InitialScrollState() | 130 InitialScrollState() |
| 131 : didRestoreFromHistory(false) | 131 : didRestoreFromHistory(false) |
| 132 { | 132 { |
| 133 } | 133 } |
| 134 | 134 |
| 135 // TODO(skobes): Move FrameView::m_wasScrolledByUser into here. | 135 // TODO(skobes): Move FrameView::m_wasScrolledByUser into here. |
| 136 bool didRestoreFromHistory; | 136 bool didRestoreFromHistory; |
| 137 }; | 137 }; |
| 138 InitialScrollState& initialScrollState() { return m_initialScrollState;
} | 138 InitialScrollState& initialScrollState() { return m_initialScrollState;
} |
| 139 | 139 |
| 140 bool loadingMultipartContent() const; |
| 141 |
| 140 protected: | 142 protected: |
| 141 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData
&); | 143 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData
&); |
| 142 | 144 |
| 143 Vector<KURL> m_redirectChain; | 145 Vector<KURL> m_redirectChain; |
| 144 | 146 |
| 145 private: | 147 private: |
| 146 static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(const Docu
ment* ownerDocument, const DocumentInit&, const AtomicString& mimeType, const At
omicString& encoding, bool dispatch, ParserSynchronizationPolicy); | 148 static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(const Docu
ment* ownerDocument, const DocumentInit&, const AtomicString& mimeType, const At
omicString& encoding, bool dispatch, ParserSynchronizationPolicy); |
| 147 | 149 |
| 148 void ensureWriter(const AtomicString& mimeType, const KURL& overridingUR
L = KURL()); | 150 void ensureWriter(const AtomicString& mimeType, const KURL& overridingUR
L = KURL()); |
| 149 void endWriting(DocumentWriter*); | 151 void endWriting(DocumentWriter*); |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 friend class ApplicationCacheHost; // for substitute resource delivery | 218 friend class ApplicationCacheHost; // for substitute resource delivery |
| 217 OwnPtrWillBePersistent<ApplicationCacheHost> m_applicationCacheHost; | 219 OwnPtrWillBePersistent<ApplicationCacheHost> m_applicationCacheHost; |
| 218 | 220 |
| 219 RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy; | 221 RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy; |
| 220 ClientHintsPreferences m_clientHintsPreferences; | 222 ClientHintsPreferences m_clientHintsPreferences; |
| 221 InitialScrollState m_initialScrollState; | 223 InitialScrollState m_initialScrollState; |
| 222 }; | 224 }; |
| 223 } | 225 } |
| 224 | 226 |
| 225 #endif // DocumentLoader_h | 227 #endif // DocumentLoader_h |
| OLD | NEW |