| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 void setArchive(PassRefPtr<MHTMLArchive>); | 126 void setArchive(PassRefPtr<MHTMLArchive>); |
| 127 void addAllArchiveResources(MHTMLArchive*); | 127 void addAllArchiveResources(MHTMLArchive*); |
| 128 PassRefPtr<MHTMLArchive> popArchiveForSubframe(const String& frameName,
const KURL&); | 128 PassRefPtr<MHTMLArchive> popArchiveForSubframe(const String& frameName,
const KURL&); |
| 129 | 129 |
| 130 bool scheduleArchiveLoad(ResourceLoader*, const ResourceRequest&); | 130 bool scheduleArchiveLoad(ResourceLoader*, const ResourceRequest&); |
| 131 | 131 |
| 132 // Return the ArchiveResource for the URL only when loading an Archive | 132 // Return the ArchiveResource for the URL only when loading an Archive |
| 133 ArchiveResource* archiveResourceForURL(const KURL&) const; | 133 ArchiveResource* archiveResourceForURL(const KURL&) const; |
| 134 | 134 |
| 135 bool scheduleDataUriLoad(ResourceLoader*, const ResourceRequest&); |
| 136 |
| 135 #ifndef NDEBUG | 137 #ifndef NDEBUG |
| 136 bool isSubstituteLoadPending(ResourceLoader*) const; | 138 bool isSubstituteLoadPending(ResourceLoader*) const; |
| 137 #endif | 139 #endif |
| 138 void cancelPendingSubstituteLoad(ResourceLoader*); | 140 void cancelPendingSubstituteLoad(ResourceLoader*); |
| 139 | 141 |
| 140 const NavigationAction& triggeringAction() const { return m_triggeringAc
tion; } | 142 const NavigationAction& triggeringAction() const { return m_triggeringAc
tion; } |
| 141 void setTriggeringAction(const NavigationAction& action) { m_triggeringA
ction = action; } | 143 void setTriggeringAction(const NavigationAction& action) { m_triggeringA
ction = action; } |
| 142 void setOverrideEncoding(const String& encoding) { m_overrideEncoding =
encoding; } | 144 void setOverrideEncoding(const String& encoding) { m_overrideEncoding =
encoding; } |
| 143 void setLastCheckedRequest(const ResourceRequest& request) { m_lastCheck
edRequest = request; } | 145 void setLastCheckedRequest(const ResourceRequest& request) { m_lastCheck
edRequest = request; } |
| 144 const ResourceRequest& lastCheckedRequest() { return m_lastCheckedReque
st; } | 146 const ResourceRequest& lastCheckedRequest() { return m_lastCheckedReque
st; } |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 | 329 |
| 328 inline void DocumentLoader::takeMemoryCacheLoadsForClientNotification(Vector
<String>& loadsSet) | 330 inline void DocumentLoader::takeMemoryCacheLoadsForClientNotification(Vector
<String>& loadsSet) |
| 329 { | 331 { |
| 330 loadsSet.swap(m_resourcesLoadedFromMemoryCacheForClientNotification); | 332 loadsSet.swap(m_resourcesLoadedFromMemoryCacheForClientNotification); |
| 331 m_resourcesLoadedFromMemoryCacheForClientNotification.clear(); | 333 m_resourcesLoadedFromMemoryCacheForClientNotification.clear(); |
| 332 } | 334 } |
| 333 | 335 |
| 334 } | 336 } |
| 335 | 337 |
| 336 #endif // DocumentLoader_h | 338 #endif // DocumentLoader_h |
| OLD | NEW |