| 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 bool isRedirect() const { return m_redirectChain.size() > 1; } | 134 bool isRedirect() const { return m_redirectChain.size() > 1; } |
| 135 void clearRedirectChain(); | 135 void clearRedirectChain(); |
| 136 void appendRedirect(const KURL&); | 136 void appendRedirect(const KURL&); |
| 137 | 137 |
| 138 protected: | 138 protected: |
| 139 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData
&); | 139 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData
&); |
| 140 | 140 |
| 141 Vector<KURL> m_redirectChain; | 141 Vector<KURL> m_redirectChain; |
| 142 | 142 |
| 143 private: | 143 private: |
| 144 static PassRefPtr<DocumentWriter> createWriterFor(LocalFrame*, const Doc
ument* ownerDocument, const KURL&, const AtomicString& mimeType, const AtomicStr
ing& encoding, bool userChosen, bool dispatch); | 144 static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(LocalFrame
*, const Document* ownerDocument, const KURL&, const AtomicString& mimeType, con
st AtomicString& encoding, bool userChosen, bool dispatch); |
| 145 | 145 |
| 146 void ensureWriter(const AtomicString& mimeType, const KURL& overridingUR
L = KURL()); | 146 void ensureWriter(const AtomicString& mimeType, const KURL& overridingUR
L = KURL()); |
| 147 void endWriting(DocumentWriter*); | 147 void endWriting(DocumentWriter*); |
| 148 | 148 |
| 149 Document* document() const; | 149 Document* document() const; |
| 150 FrameLoader* frameLoader() const; | 150 FrameLoader* frameLoader() const; |
| 151 | 151 |
| 152 void commitIfReady(); | 152 void commitIfReady(); |
| 153 void commitData(const char* bytes, size_t length); | 153 void commitData(const char* bytes, size_t length); |
| 154 void setMainDocumentError(const ResourceError&); | 154 void setMainDocumentError(const ResourceError&); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 174 | 174 |
| 175 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&
); | 175 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&
); |
| 176 | 176 |
| 177 bool shouldContinueForResponse() const; | 177 bool shouldContinueForResponse() const; |
| 178 | 178 |
| 179 LocalFrame* m_frame; | 179 LocalFrame* m_frame; |
| 180 RefPtrWillBePersistent<ResourceFetcher> m_fetcher; | 180 RefPtrWillBePersistent<ResourceFetcher> m_fetcher; |
| 181 | 181 |
| 182 ResourcePtr<RawResource> m_mainResource; | 182 ResourcePtr<RawResource> m_mainResource; |
| 183 | 183 |
| 184 RefPtr<DocumentWriter> m_writer; | 184 RefPtrWillBePersistent<DocumentWriter> m_writer; |
| 185 | 185 |
| 186 // A reference to actual request used to create the data source. | 186 // A reference to actual request used to create the data source. |
| 187 // The only part of this request that should change is the url, and | 187 // The only part of this request that should change is the url, and |
| 188 // that only in the case of a same-document navigation. | 188 // that only in the case of a same-document navigation. |
| 189 ResourceRequest m_originalRequest; | 189 ResourceRequest m_originalRequest; |
| 190 | 190 |
| 191 SubstituteData m_substituteData; | 191 SubstituteData m_substituteData; |
| 192 | 192 |
| 193 // The 'working' request. It may be mutated | 193 // The 'working' request. It may be mutated |
| 194 // several times from the original request to include additional | 194 // several times from the original request to include additional |
| (...skipping 21 matching lines...) Expand all Loading... |
| 216 DocumentLoadTiming m_documentLoadTiming; | 216 DocumentLoadTiming m_documentLoadTiming; |
| 217 | 217 |
| 218 double m_timeOfLastDataReceived; | 218 double m_timeOfLastDataReceived; |
| 219 | 219 |
| 220 friend class ApplicationCacheHost; // for substitute resource delivery | 220 friend class ApplicationCacheHost; // for substitute resource delivery |
| 221 OwnPtr<ApplicationCacheHost> m_applicationCacheHost; | 221 OwnPtr<ApplicationCacheHost> m_applicationCacheHost; |
| 222 }; | 222 }; |
| 223 } | 223 } |
| 224 | 224 |
| 225 #endif // DocumentLoader_h | 225 #endif // DocumentLoader_h |
| OLD | NEW |