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

Side by Side Diff: third_party/WebKit/WebCore/loader/DocumentLoader.h

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | Annotate | Revision Log
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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 void setTriggeringAction(const NavigationAction& action) { m_triggeringA ction = action; } 149 void setTriggeringAction(const NavigationAction& action) { m_triggeringA ction = action; }
150 void setOverrideEncoding(const String& encoding) { m_overrideEncoding = encoding; } 150 void setOverrideEncoding(const String& encoding) { m_overrideEncoding = encoding; }
151 void setLastCheckedRequest(const ResourceRequest& request) { m_lastCheck edRequest = request; } 151 void setLastCheckedRequest(const ResourceRequest& request) { m_lastCheck edRequest = request; }
152 const ResourceRequest& lastCheckedRequest() { return m_lastCheckedReque st; } 152 const ResourceRequest& lastCheckedRequest() { return m_lastCheckedReque st; }
153 153
154 void stopRecordingResponses(); 154 void stopRecordingResponses();
155 const String& title() const { return m_pageTitle; } 155 const String& title() const { return m_pageTitle; }
156 156
157 KURL urlForHistory() const; 157 KURL urlForHistory() const;
158 bool urlForHistoryReflectsFailure() const; 158 bool urlForHistoryReflectsFailure() const;
159 bool urlForHistoryReflectsServerRedirect() const { return urlForHistory( ) != url(); }
160 bool urlForHistoryReflectsClientRedirect() const { return m_urlForHistor yReflectsClientRedirect; }
161 void setURLForHistoryReflectsClientRedirect(bool b) { m_urlForHistoryRef lectsClientRedirect = b; }
159 162
160 void loadFromCachedPage(PassRefPtr<CachedPage>); 163 void loadFromCachedPage(PassRefPtr<CachedPage>);
161 void setLoadingFromCachedPage(bool loading) { m_loadingFromCachedPage = loading; } 164 void setLoadingFromCachedPage(bool loading) { m_loadingFromCachedPage = loading; }
162 bool isLoadingFromCachedPage() const { return m_loadingFromCachedPage; } 165 bool isLoadingFromCachedPage() const { return m_loadingFromCachedPage; }
163 166
164 void setDefersLoading(bool); 167 void setDefersLoading(bool);
165 168
166 bool startLoadingMainResource(unsigned long identifier); 169 bool startLoadingMainResource(unsigned long identifier);
167 void cancelMainResourceLoad(const ResourceError&); 170 void cancelMainResourceLoad(const ResourceError&);
168 171
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 283
281 typedef HashMap<RefPtr<ResourceLoader>, RefPtr<SubstituteResource> > Sub stituteResourceMap; 284 typedef HashMap<RefPtr<ResourceLoader>, RefPtr<SubstituteResource> > Sub stituteResourceMap;
282 SubstituteResourceMap m_pendingSubstituteResources; 285 SubstituteResourceMap m_pendingSubstituteResources;
283 Timer<DocumentLoader> m_substituteResourceDeliveryTimer; 286 Timer<DocumentLoader> m_substituteResourceDeliveryTimer;
284 287
285 OwnPtr<ArchiveResourceCollection> m_archiveResourceCollection; 288 OwnPtr<ArchiveResourceCollection> m_archiveResourceCollection;
286 RefPtr<SharedBuffer> m_parsedArchiveData; 289 RefPtr<SharedBuffer> m_parsedArchiveData;
287 290
288 HashSet<String> m_resourcesClientKnowsAbout; 291 HashSet<String> m_resourcesClientKnowsAbout;
289 Vector<String> m_resourcesLoadedFromMemoryCacheForClientNotification; 292 Vector<String> m_resourcesLoadedFromMemoryCacheForClientNotification;
293
294 bool m_urlForHistoryReflectsClientRedirect;
290 295
291 #if ENABLE(OFFLINE_WEB_APPLICATIONS) 296 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
292 // The application cache that the document loader is associated with (if any). 297 // The application cache that the document loader is associated with (if any).
293 RefPtr<ApplicationCache> m_applicationCache; 298 RefPtr<ApplicationCache> m_applicationCache;
294 299
295 // Before an application cache has finished loading, this will be the ca ndidate application 300 // Before an application cache has finished loading, this will be the ca ndidate application
296 // group that the document loader is associated with. 301 // group that the document loader is associated with.
297 ApplicationCacheGroup* m_candidateApplicationCacheGroup; 302 ApplicationCacheGroup* m_candidateApplicationCacheGroup;
298 303
299 // Once the main resource has finished loading, this is the application cache it was loaded from (if any). 304 // Once the main resource has finished loading, this is the application cache it was loaded from (if any).
300 RefPtr<ApplicationCache> m_mainResourceApplicationCache; 305 RefPtr<ApplicationCache> m_mainResourceApplicationCache;
301 #endif 306 #endif
302 }; 307 };
303 308
304 inline void DocumentLoader::recordMemoryCacheLoadForFutureClientNotification (const String& url) 309 inline void DocumentLoader::recordMemoryCacheLoadForFutureClientNotification (const String& url)
305 { 310 {
306 m_resourcesLoadedFromMemoryCacheForClientNotification.append(url); 311 m_resourcesLoadedFromMemoryCacheForClientNotification.append(url);
307 } 312 }
308 313
309 inline void DocumentLoader::takeMemoryCacheLoadsForClientNotification(Vector <String>& loadsSet) 314 inline void DocumentLoader::takeMemoryCacheLoadsForClientNotification(Vector <String>& loadsSet)
310 { 315 {
311 loadsSet.swap(m_resourcesLoadedFromMemoryCacheForClientNotification); 316 loadsSet.swap(m_resourcesLoadedFromMemoryCacheForClientNotification);
312 m_resourcesLoadedFromMemoryCacheForClientNotification.clear(); 317 m_resourcesLoadedFromMemoryCacheForClientNotification.clear();
313 } 318 }
314 319
315 } 320 }
316 321
317 #endif // DocumentLoader_h 322 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/html/HTMLTokenizer.cpp ('k') | third_party/WebKit/WebCore/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698