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

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 237f7b107be8f5d7d34218c059adeaf2845588ac..97602a9da9152802c17525c86f629c6c3601c2ba 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -224,7 +224,7 @@ WebTaskRunner* ResourceFetcher::loadingTaskRunner()
Resource* ResourceFetcher::cachedResource(const KURL& resourceURL) const
{
KURL url = MemoryCache::removeFragmentIdentifierIfNeeded(resourceURL);
- const WeakPtrWillBeWeakMember<Resource>& resource = m_documentResources.get(url);
+ const WeakMember<Resource>& resource = m_documentResources.get(url);
return resource.get();
}
@@ -339,7 +339,7 @@ void ResourceFetcher::preCacheData(const FetchRequest& request, const ResourceFa
response.setHTTPStatusCode(200);
response.setHTTPStatusText("OK");
- RefPtrWillBeRawPtr<Resource> resource = factory.create(request.resourceRequest(), request.charset());
+ RawPtr<Resource> resource = factory.create(request.resourceRequest(), request.charset());
resource->setNeedsSynchronousCacheHit(substituteData.forceSynchronousLoad());
resource->setOptions(request.options());
// FIXME: We should provide a body stream here.
@@ -365,7 +365,7 @@ void ResourceFetcher::moveCachedNonBlockingResourceToBlocking(Resource* resource
}
}
-PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest& request, const ResourceFactory& factory, const SubstituteData& substituteData)
+RawPtr<Resource> ResourceFetcher::requestResource(FetchRequest& request, const ResourceFactory& factory, const SubstituteData& substituteData)
{
ASSERT(request.options().synchronousPolicy == RequestAsynchronously || factory.type() == Resource::Raw || factory.type() == Resource::XSLStyleSheet);
@@ -405,7 +405,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest&
bool isStaticData = request.resourceRequest().url().protocolIsData() || substituteData.isValid();
if (isStaticData)
preCacheData(request, factory, substituteData);
- RefPtrWillBeRawPtr<Resource> resource = memoryCache()->resourceForURL(url, getCacheIdentifier());
+ RawPtr<Resource> resource = memoryCache()->resourceForURL(url, getCacheIdentifier());
// See if we can use an existing resource from the cache. If so, we need to move it to be load blocking.
moveCachedNonBlockingResourceToBlocking(resource.get(), request);
@@ -563,7 +563,7 @@ void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour
resource->setRevalidatingRequest(revalidatingRequest);
}
-PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::createResourceForLoading(FetchRequest& request, const String& charset, const ResourceFactory& factory)
+RawPtr<Resource> ResourceFetcher::createResourceForLoading(FetchRequest& request, const String& charset, const ResourceFactory& factory)
{
const String cacheIdentifier = getCacheIdentifier();
ASSERT(!memoryCache()->resourceForURL(request.resourceRequest().url(), cacheIdentifier));
@@ -571,7 +571,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::createResourceForLoading(Fetch
WTF_LOG(ResourceLoading, "Loading Resource for '%s'.", request.resourceRequest().url().elidedString().latin1().data());
initializeResourceRequest(request.mutableResourceRequest(), factory.type());
- RefPtrWillBeRawPtr<Resource> resource = factory.create(request.resourceRequest(), charset);
+ RawPtr<Resource> resource = factory.create(request.resourceRequest(), charset);
resource->setLinkPreload(request.isLinkPreload());
resource->setCacheIdentifier(cacheIdentifier);
@@ -841,7 +841,7 @@ void ResourceFetcher::preloadStarted(Resource* resource)
resource->increasePreloadCount();
if (!m_preloads)
- m_preloads = adoptPtrWillBeNoop(new WillBeHeapListHashSet<RefPtrWillBeMember<Resource>>);
+ m_preloads = (new HeapListHashSet<Member<Resource>>);
m_preloads->add(resource);
#if PRELOAD_DEBUG

Powered by Google App Engine
This is Rietveld 408576698