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

Side by Side Diff: Source/WebCore/platform/network/qt/ResourceHandleQt.cpp

Issue 12090050: Revert 138962 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1397/
Patch Set: Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008 Holger Hans Peter Freyther 4 * Copyright (C) 2008 Holger Hans Peter Freyther
5 * 5 *
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 d->m_job->abort(); 118 d->m_job->abort();
119 d->m_job = 0; 119 d->m_job = 0;
120 } 120 }
121 } 121 }
122 122
123 bool ResourceHandle::loadsBlocked() 123 bool ResourceHandle::loadsBlocked()
124 { 124 {
125 return false; 125 return false;
126 } 126 }
127 127
128 bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame* frame)
129 {
130 if (!frame)
131 return false;
132
133 QNetworkAccessManager* manager = 0;
134 QAbstractNetworkCache* cache = 0;
135 if (frame->loader()->networkingContext()) {
136 manager = frame->loader()->networkingContext()->networkAccessManager();
137 cache = manager->cache();
138 }
139
140 if (!cache)
141 return false;
142
143 QNetworkCacheMetaData data = cache->metaData(request.url());
144 if (data.isValid()) {
145 request.setCachePolicy(ReturnCacheDataDontLoad);
146 return true;
147 }
148
149 return false;
150 }
151
128 void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials /*storedCredentials*/, ResourceErro r& error, ResourceResponse& response, Vector<char>& data) 152 void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials /*storedCredentials*/, ResourceErro r& error, ResourceResponse& response, Vector<char>& data)
129 { 153 {
130 #if ENABLE(BLOB) 154 #if ENABLE(BLOB)
131 if (request.url().protocolIs("blob")) { 155 if (request.url().protocolIs("blob")) {
132 blobRegistry().loadResourceSynchronously(request, error, response, data) ; 156 blobRegistry().loadResourceSynchronously(request, error, response, data) ;
133 return; 157 return;
134 } 158 }
135 #endif 159 #endif
136 WebCoreSynchronousLoader syncLoader(error, response, data); 160 WebCoreSynchronousLoader syncLoader(error, response, data);
137 RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(request, &syncLo ader, true, false)); 161 RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(request, &syncLo ader, true, false));
(...skipping 15 matching lines...) Expand all
153 } 177 }
154 178
155 void ResourceHandle::platformSetDefersLoading(bool defers) 179 void ResourceHandle::platformSetDefersLoading(bool defers)
156 { 180 {
157 if (!d->m_job) 181 if (!d->m_job)
158 return; 182 return;
159 d->m_job->setLoadingDeferred(defers); 183 d->m_job->setLoadingDeferred(defers);
160 } 184 }
161 185
162 } // namespace WebCore 186 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/platform/network/mac/ResourceHandleMac.mm ('k') | Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698