Changeset 92399 in webkit
- Timestamp:
- Aug 4, 2011 12:23:27 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r92398 r92399 1 2011-08-04 Jochen Eisinger <jochen@chromium.org> 2 3 Get rid of ResourceRequestBase::m_targetType. Move it to chromium's ResourceRequest. 4 https://bugs.webkit.org/show_bug.cgi?id=48483 5 6 Reviewed by Alexey Proskuryakov. 7 8 * loader/PingLoader.cpp: 9 (WebCore::PingLoader::loadImage): 10 (WebCore::PingLoader::sendPing): 11 (WebCore::PingLoader::reportContentSecurityPolicyViolation): 12 * loader/cache/CachedResourceRequest.cpp: 13 (WebCore::CachedResourceRequest::load): 14 * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: 15 (webKitWebSrcStart): 16 * platform/network/ResourceRequestBase.cpp: 17 (WebCore::ResourceRequestBase::adopt): 18 (WebCore::ResourceRequestBase::copyData): 19 * platform/network/ResourceRequestBase.h: 20 (WebCore::ResourceRequestBase::ResourceRequestBase): 21 * platform/network/chromium/ResourceRequest.cpp: 22 (WebCore::ResourceRequest::doPlatformCopyData): 23 (WebCore::ResourceRequest::doPlatformAdopt): 24 * platform/network/chromium/ResourceRequest.h: 25 (WebCore::ResourceRequest::ResourceRequest): 26 (WebCore::ResourceRequest::targetType): 27 (WebCore::ResourceRequest::setTargetType): 28 * workers/DefaultSharedWorkerRepository.cpp: 29 (WebCore::SharedWorkerScriptLoader::load): 30 * workers/Worker.cpp: 31 (WebCore::Worker::create): 32 * workers/WorkerContext.cpp: 33 (WebCore::WorkerContext::importScripts): 34 * workers/WorkerScriptLoader.cpp: 35 (WebCore::WorkerScriptLoader::WorkerScriptLoader): 36 (WebCore::WorkerScriptLoader::createResourceRequest): 37 * workers/WorkerScriptLoader.h: 38 (WebCore::WorkerScriptLoader::create): 39 (WebCore::WorkerScriptLoader::setTargetType): 40 1 41 2011-08-04 Jeff Miller <jeffm@apple.com> 2 42 -
trunk/Source/WebCore/loader/PingLoader.cpp
r91306 r92399 56 56 57 57 ResourceRequest request(url); 58 #if PLATFORM(CHROMIUM) 58 59 request.setTargetType(ResourceRequest::TargetIsImage); 60 #endif 59 61 request.setHTTPHeaderField("Cache-Control", "max-age=0"); 60 62 if (!SecurityOrigin::shouldHideReferrer(request.url(), frame->loader()->outgoingReferrer())) … … 72 74 { 73 75 ResourceRequest request(pingURL); 76 #if PLATFORM(CHROMIUM) 74 77 request.setTargetType(ResourceRequest::TargetIsSubresource); 78 #endif 75 79 request.setHTTPMethod("POST"); 76 80 request.setHTTPContentType("text/ping"); … … 98 102 { 99 103 ResourceRequest request(reportURL); 104 #if PLATFORM(CHROMIUM) 100 105 request.setTargetType(ResourceRequest::TargetIsSubresource); 106 #endif 101 107 request.setHTTPMethod("POST"); 102 108 request.setHTTPContentType("application/x-www-form-urlencoded"); -
trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp
r89155 r92399 45 45 46 46 namespace WebCore { 47 47 48 #if PLATFORM(CHROMIUM) 48 49 static ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource::Type type) 49 50 { … … 72 73 return ResourceRequest::TargetIsSubresource; 73 74 } 75 #endif 74 76 75 77 CachedResourceRequest::CachedResourceRequest(CachedResourceLoader* cachedResourceLoader, CachedResource* resource, bool incremental) … … 91 93 92 94 ResourceRequest resourceRequest = resource->resourceRequest(); 95 #if PLATFORM(CHROMIUM) 93 96 resourceRequest.setTargetType(cachedResourceTypeToTargetType(resource->type())); 97 #endif 94 98 95 99 if (!resource->accept().isEmpty()) -
trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
r84260 r92399 413 413 414 414 ResourceRequest request(url); 415 request.setTargetType(ResourceRequestBase::TargetIsMedia);416 415 request.setAllowCookies(true); 417 416 -
trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp
r84881 r92399 54 54 request->setHTTPMethod(data->m_httpMethod); 55 55 request->setPriority(data->m_priority); 56 request->setTargetType(data->m_targetType);57 56 58 57 request->updateResourceRequest(); … … 88 87 data->m_httpHeaders = httpHeaderFields().copyData(); 89 88 data->m_priority = priority(); 90 data->m_targetType = m_targetType;91 89 92 90 data->m_responseContentDispositionEncodingFallbackArray.reserveInitialCapacity(m_responseContentDispositionEncodingFallbackArray.size()); -
trunk/Source/WebCore/platform/network/ResourceRequestBase.h
r87020 r92399 52 52 WTF_MAKE_FAST_ALLOCATED; 53 53 public: 54 // The type of this ResourceRequest, based on how the resource will be used.55 enum TargetType {56 TargetIsMainFrame,57 TargetIsSubframe,58 TargetIsSubresource, // Resource is a generic subresource. (Generally a specific type should be specified)59 TargetIsStyleSheet,60 TargetIsScript,61 TargetIsFontResource,62 TargetIsImage,63 TargetIsObject,64 TargetIsMedia,65 TargetIsWorker,66 TargetIsSharedWorker,67 TargetIsPrefetch,68 TargetIsPrerender,69 TargetIsFavicon,70 };71 72 54 static PassOwnPtr<ResourceRequest> adopt(PassOwnPtr<CrossThreadResourceRequestData>); 73 55 … … 147 129 bool reportRawHeaders() const { return m_reportRawHeaders; } 148 130 void setReportRawHeaders(bool reportRawHeaders) { m_reportRawHeaders = reportRawHeaders; } 149 150 // What this request is for.151 // FIXME: This should be moved out of ResourceRequestBase, <https://bugs.webkit.org/show_bug.cgi?id=48483>.152 TargetType targetType() const { return m_targetType; }153 void setTargetType(TargetType type) { m_targetType = type; }154 131 155 132 static double defaultTimeoutInterval(); // May return 0 when using platform default. … … 167 144 , m_reportRawHeaders(false) 168 145 , m_priority(ResourceLoadPriorityLow) 169 , m_targetType(TargetIsSubresource)170 146 { 171 147 } … … 183 159 , m_reportRawHeaders(false) 184 160 , m_priority(ResourceLoadPriorityLow) 185 , m_targetType(TargetIsSubresource)186 161 { 187 162 } … … 209 184 bool m_reportRawHeaders; 210 185 ResourceLoadPriority m_priority; 211 TargetType m_targetType;212 186 213 187 private: … … 238 212 bool m_allowCookies; 239 213 ResourceLoadPriority m_priority; 240 ResourceRequestBase::TargetType m_targetType;241 214 }; 242 215 -
trunk/Source/WebCore/platform/network/chromium/ResourceRequest.cpp
r78253 r92399 45 45 data->m_hasUserGesture = m_hasUserGesture; 46 46 data->m_downloadToFile = m_downloadToFile; 47 data->m_targetType = m_targetType; 47 48 return data; 48 49 } … … 55 56 m_hasUserGesture = data->m_hasUserGesture; 56 57 m_downloadToFile = data->m_downloadToFile; 58 m_targetType = data->m_targetType; 57 59 } 58 60 -
trunk/Source/WebCore/platform/network/chromium/ResourceRequest.h
r87015 r92399 40 40 class ResourceRequest : public ResourceRequestBase { 41 41 public: 42 // The type of this ResourceRequest, based on how the resource will be used. 43 enum TargetType { 44 TargetIsMainFrame, 45 TargetIsSubframe, 46 TargetIsSubresource, // Resource is a generic subresource. (Generally a specific type should be specified) 47 TargetIsStyleSheet, 48 TargetIsScript, 49 TargetIsFontResource, 50 TargetIsImage, 51 TargetIsObject, 52 TargetIsMedia, 53 TargetIsWorker, 54 TargetIsSharedWorker, 55 TargetIsPrefetch, 56 TargetIsPrerender, 57 TargetIsFavicon, 58 }; 59 42 60 class ExtraData : public RefCounted<ExtraData> { 43 61 public: … … 52 70 , m_hasUserGesture(false) 53 71 , m_downloadToFile(false) 72 , m_targetType(TargetIsSubresource) 54 73 { 55 74 } … … 62 81 , m_hasUserGesture(false) 63 82 , m_downloadToFile(false) 83 , m_targetType(TargetIsSubresource) 64 84 { 65 85 } … … 72 92 , m_hasUserGesture(false) 73 93 , m_downloadToFile(false) 94 , m_targetType(TargetIsSubresource) 74 95 { 75 96 setHTTPReferrer(referrer); … … 83 104 , m_hasUserGesture(false) 84 105 , m_downloadToFile(false) 106 , m_targetType(TargetIsSubresource) 85 107 { 86 108 } … … 113 135 void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; } 114 136 137 // What this request is for. 138 TargetType targetType() const { return m_targetType; } 139 void setTargetType(TargetType type) { m_targetType = type; } 140 115 141 private: 116 142 friend class ResourceRequestBase; … … 128 154 bool m_downloadToFile; 129 155 RefPtr<ExtraData> m_extraData; 156 TargetType m_targetType; 130 157 }; 131 158 … … 136 163 bool m_hasUserGesture; 137 164 bool m_downloadToFile; 165 ResourceRequest::TargetType m_targetType; 138 166 }; 139 167 -
trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp
r88578 r92399 289 289 290 290 // Mark this object as active for the duration of the load. 291 m_scriptLoader = WorkerScriptLoader::create(ResourceRequestBase::TargetIsSharedWorker); 291 m_scriptLoader = WorkerScriptLoader::create(); 292 #if PLATFORM(CHROMIUM) 293 m_scriptLoader->setTargetType(ResourceRequest::TargetIsSharedWorker); 294 #endif 292 295 m_scriptLoader->loadAsynchronously(m_worker->scriptExecutionContext(), url, DenyCrossOriginRequests, this); 293 296 } -
trunk/Source/WebCore/workers/Worker.cpp
r89652 r92399 68 68 worker->setPendingActivity(worker.get()); 69 69 70 worker->m_scriptLoader = WorkerScriptLoader::create(ResourceRequestBase::TargetIsWorker); 70 worker->m_scriptLoader = WorkerScriptLoader::create(); 71 #if PLATFORM(CHROMIUM) 72 worker->m_scriptLoader->setTargetType(ResourceRequest::TargetIsWorker); 73 #endif 71 74 worker->m_scriptLoader->loadAsynchronously(context, scriptURL, DenyCrossOriginRequests, worker.get()); 72 75 -
trunk/Source/WebCore/workers/WorkerContext.cpp
r88578 r92399 246 246 247 247 for (Vector<KURL>::const_iterator it = completedURLs.begin(); it != end; ++it) { 248 RefPtr<WorkerScriptLoader> scriptLoader(WorkerScriptLoader::create(ResourceRequestBase::TargetIsScript)); 248 RefPtr<WorkerScriptLoader> scriptLoader(WorkerScriptLoader::create()); 249 #if PLATFORM(CHROMIUM) 250 scriptLoader->setTargetType(ResourceRequest::TargetIsScript); 251 #endif 249 252 scriptLoader->loadSynchronously(scriptExecutionContext(), *it, AllowCrossOriginRequests); 250 253 -
trunk/Source/WebCore/workers/WorkerScriptLoader.cpp
r90284 r92399 33 33 34 34 #include "CrossThreadTask.h" 35 #include "ResourceRequest.h"36 35 #include "ResourceResponse.h" 37 36 #include "ScriptExecutionContext.h" … … 48 47 namespace WebCore { 49 48 50 WorkerScriptLoader::WorkerScriptLoader( ResourceRequestBase::TargetType targetType)49 WorkerScriptLoader::WorkerScriptLoader() 51 50 : m_client(0) 52 51 , m_failed(false) 53 52 , m_identifier(0) 54 , m_targetType(targetType)55 53 , m_finishing(false) 54 #if PLATFORM(CHROMIUM) 55 , m_targetType(ResourceRequest::TargetIsWorker) 56 #endif 56 57 { 57 58 } … … 109 110 OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest(m_url)); 110 111 request->setHTTPMethod("GET"); 112 #if PLATFORM(CHROMIUM) 111 113 request->setTargetType(m_targetType); 114 #endif 112 115 return request.release(); 113 116 } -
trunk/Source/WebCore/workers/WorkerScriptLoader.h
r90284 r92399 32 32 33 33 #include "KURL.h" 34 #include "ResourceRequest Base.h"34 #include "ResourceRequest.h" 35 35 #include "ThreadableLoader.h" 36 36 #include "ThreadableLoaderClient.h" … … 51 51 WTF_MAKE_FAST_ALLOCATED; 52 52 public: 53 static PassRefPtr<WorkerScriptLoader> create( ResourceRequestBase::TargetType targetType)53 static PassRefPtr<WorkerScriptLoader> create() 54 54 { 55 return adoptRef(new WorkerScriptLoader( targetType));55 return adoptRef(new WorkerScriptLoader()); 56 56 } 57 57 … … 74 74 virtual void didReceiveAuthenticationCancellation(unsigned long /*identifier*/, const ResourceResponse&); 75 75 76 #if PLATFORM(CHROMIUM) 77 void setTargetType(ResourceRequest::TargetType targetType) { m_targetType = targetType; } 78 #endif 79 76 80 private: 77 81 friend class WTF::RefCounted<WorkerScriptLoader>; 78 82 79 explicit WorkerScriptLoader(ResourceRequestBase::TargetType);83 WorkerScriptLoader(); 80 84 ~WorkerScriptLoader(); 81 85 … … 92 96 bool m_failed; 93 97 unsigned long m_identifier; 94 ResourceRequestBase::TargetType m_targetType;95 98 bool m_finishing; 99 #if PLATFORM(CHROMIUM) 100 ResourceRequest::TargetType m_targetType; 101 #endif 96 102 }; 97 103 -
trunk/Source/WebKit/chromium/ChangeLog
r92384 r92399 1 2011-08-04 Jochen Eisinger <jochen@chromium.org> 2 3 Get rid of ResourceRequestBase::m_targetType. Move it to chromium's ResourceRequest. 4 https://bugs.webkit.org/show_bug.cgi?id=48483 5 6 Reviewed by Alexey Proskuryakov. 7 8 * src/SharedWorkerRepository.cpp: 9 (WebCore::SharedWorkerScriptLoader::SharedWorkerScriptLoader): 10 1 11 2011-08-04 Brian Weinstein <bweinstein@apple.com> 2 12 -
trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp
r88578 r92399 71 71 , m_webWorker(webWorker) 72 72 , m_port(port) 73 , m_scriptLoader(WorkerScriptLoader::create( ResourceRequestBase::TargetIsSharedWorker))73 , m_scriptLoader(WorkerScriptLoader::create()) 74 74 , m_loading(false) 75 75 , m_responseAppCacheID(0) 76 76 { 77 m_scriptLoader->setTargetType(ResourceRequest::TargetIsSharedWorker); 77 78 } 78 79
Note: See TracChangeset
for help on using the changeset viewer.