Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Side by Side Diff: Source/core/loader/DocumentLoader.h

Issue 125403003: Fix crash on incorrectly formatted MHTML documents (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 void setRequest(const ResourceRequest&); 170 void setRequest(const ResourceRequest&);
171 171
172 void commitIfReady(); 172 void commitIfReady();
173 void commitData(const char* bytes, size_t length); 173 void commitData(const char* bytes, size_t length);
174 void setMainDocumentError(const ResourceError&); 174 void setMainDocumentError(const ResourceError&);
175 void clearMainResourceLoader(); 175 void clearMainResourceLoader();
176 ResourceLoader* mainResourceLoader() const; 176 ResourceLoader* mainResourceLoader() const;
177 void clearMainResourceHandle(); 177 void clearMainResourceHandle();
178 178
179 void createArchive(); 179 bool maybeCreateArchive();
180 void clearArchiveResources(); 180 void clearArchiveResources();
181 181
182 void prepareSubframeArchiveLoadIfNeeded(); 182 void prepareSubframeArchiveLoadIfNeeded();
183 void addAllArchiveResources(MHTMLArchive*); 183 void addAllArchiveResources(MHTMLArchive*);
184 184
185 void willSendRequest(ResourceRequest&, const ResourceResponse&); 185 void willSendRequest(ResourceRequest&, const ResourceResponse&);
186 void finishedLoading(double finishTime); 186 void finishedLoading(double finishTime);
187 void mainReceivedError(const ResourceError&); 187 void mainReceivedError(const ResourceError&);
188 virtual void redirectReceived(Resource*, ResourceRequest&, const Resourc eResponse&) OVERRIDE; 188 virtual void redirectReceived(Resource*, ResourceRequest&, const Resourc eResponse&) OVERRIDE;
189 virtual void responseReceived(Resource*, const ResourceResponse&) OVERRI DE; 189 virtual void responseReceived(Resource*, const ResourceResponse&) OVERRI DE;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 DocumentLoadTiming m_documentLoadTiming; 241 DocumentLoadTiming m_documentLoadTiming;
242 242
243 double m_timeOfLastDataReceived; 243 double m_timeOfLastDataReceived;
244 244
245 friend class ApplicationCacheHost; // for substitute resource delivery 245 friend class ApplicationCacheHost; // for substitute resource delivery
246 OwnPtr<ApplicationCacheHost> m_applicationCacheHost; 246 OwnPtr<ApplicationCacheHost> m_applicationCacheHost;
247 }; 247 };
248 } 248 }
249 249
250 #endif // DocumentLoader_h 250 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « LayoutTests/mhtml/invalid-bad-boundary2-expected.txt ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698