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

Side by Side Diff: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 2 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 #endif 182 #endif
183 } 183 }
184 184
185 ResourceFetcher::~ResourceFetcher() 185 ResourceFetcher::~ResourceFetcher()
186 { 186 {
187 #if !ENABLE(OILPAN) 187 #if !ENABLE(OILPAN)
188 clearPreloads(); 188 clearPreloads();
189 #endif 189 #endif
190 } 190 }
191 191
192 WebTaskRunner* ResourceFetcher::loadingTaskRunner()
193 {
194 if (!m_context)
195 return nullptr;
196
197 return m_context->loadingTaskRunner();
198 }
199
200 Resource* ResourceFetcher::cachedResource(const KURL& resourceURL) const 192 Resource* ResourceFetcher::cachedResource(const KURL& resourceURL) const
201 { 193 {
202 KURL url = MemoryCache::removeFragmentIdentifierIfNeeded(resourceURL); 194 KURL url = MemoryCache::removeFragmentIdentifierIfNeeded(resourceURL);
203 return m_documentResources.get(url).get(); 195 return m_documentResources.get(url).get();
204 } 196 }
205 197
206 bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sour ceOrigin, const KURL& url, AccessControlLoggingDecision logErrorsDecision) const 198 bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sour ceOrigin, const KURL& url, AccessControlLoggingDecision logErrorsDecision) const
207 { 199 {
208 // Redirects can change the response URL different from one of request. 200 // Redirects can change the response URL different from one of request.
209 bool forPreload = resource->isUnusedPreload(); 201 bool forPreload = resource->isUnusedPreload();
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 visitor->trace(m_archiveResourceCollection); 1159 visitor->trace(m_archiveResourceCollection);
1168 visitor->trace(m_loaders); 1160 visitor->trace(m_loaders);
1169 visitor->trace(m_nonBlockingLoaders); 1161 visitor->trace(m_nonBlockingLoaders);
1170 #if ENABLE(OILPAN) 1162 #if ENABLE(OILPAN)
1171 visitor->trace(m_preloads); 1163 visitor->trace(m_preloads);
1172 visitor->trace(m_resourceTimingInfoMap); 1164 visitor->trace(m_resourceTimingInfoMap);
1173 #endif 1165 #endif
1174 } 1166 }
1175 1167
1176 } 1168 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.h ('k') | third_party/WebKit/Source/core/fetch/ResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698