Improve C++11 in /fetch

    
Use the actual type in places where it makes the code clearer and not
any longer. Fix spelling error. Use nullptr.

Review URL: https://codereview.chromium.org/665613002

git-svn-id: svn://svn.chromium.org/blink/trunk@183964 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/fetch/ImageResource.cpp

@@ -120,7 +120,7 @@ void ImageResource::switchClientsToRevalidatedResource()
     ASSERT(resourceToRevalidate()->isImage());
     // Pending container size requests need to be transferred to the revalidated resource.
     if (!m_pendingContainerSizeRequests.isEmpty()) {
-        // A copy of pending size requests is needed as they are deleted during Resource::switchClientsToRevalidateResouce().
+        // A copy of pending size requests is needed as they are deleted during Resource::switchClientsToRevalidateResource().
         ContainerSizeRequests switchContainerSizeRequests;
         for (const auto& containerSizeRequest : m_pendingContainerSizeRequests)
             switchContainerSizeRequests.set(containerSizeRequest.key, containerSizeRequest.value);
@@ -341,7 +341,7 @@ inline void ImageResource::clearImage()
     // If our Image has an observer, it's always us so we need to clear the back pointer
     // before dropping our reference.
     if (m_image)
-        m_image->setImageObserver(0);
+        m_image->setImageObserver(nullptr);
     m_image.clear();
 }
 
@@ -387,7 +387,7 @@ void ImageResource::updateImage(bool allDataReceived)
 
 void ImageResource::updateBitmapImages(HashSet<ImageResource*>& images, bool redecodeImages)
 {
-    for (const auto& imageResource : images) {
+    for (ImageResource* imageResource : images) {
         if (!imageResource->hasImage() || imageResource->image()->isNull())
             continue;
         BitmapImage* image = toBitmapImage(imageResource->image());

third_party/WebKit/Source/core/fetch/ImageResource.h

@@ -121,7 +121,7 @@ private:
     void updateImage(bool allDataReceived);
     void clearImage();
     // If not null, changeRect is the changed part of the image.
-    void notifyObservers(const IntRect* changeRect = 0);
+    void notifyObservers(const IntRect* changeRect = nullptr);
 
     virtual void switchClientsToRevalidatedResource() override;
 

third_party/WebKit/Source/core/fetch/Resource.cpp

@@ -447,7 +447,7 @@ bool Resource::hasOneHandle() const
 CachedMetadata* Resource::cachedMetadata(unsigned dataTypeID) const
 {
     if (!m_cachedMetadata || m_cachedMetadata->dataTypeID() != dataTypeID)
-        return 0;
+        return nullptr;
     return m_cachedMetadata.get();
 }
 
@@ -693,7 +693,7 @@ void Resource::switchClientsToRevalidatedResource()
     m_resourceToRevalidate->m_identifier = m_identifier;
 
     m_switchingClientsToRevalidatedResource = true;
-    for (const auto& handle : m_handlesToRevalidate) {
+    for (ResourcePtrBase* handle : m_handlesToRevalidate) {
         handle->m_resource = m_resourceToRevalidate;
         m_resourceToRevalidate->registerHandle(handle);
         --m_handleCount;
@@ -702,12 +702,10 @@ void Resource::switchClientsToRevalidatedResource()
     m_handlesToRevalidate.clear();
 
     Vector<ResourceClient*> clientsToMove;
-    for (const auto& clientHash : m_clients) {
-        unsigned count = clientHash.value;
-        while (count) {
-            clientsToMove.append(clientHash.key);
-            --count;
-        }
+    for (const auto& clientHashEntry : m_clients) {
+        unsigned count = clientHashEntry.value;
+        while (count--)
+            clientsToMove.append(clientHashEntry.key);
     }
 
     unsigned moveCount = clientsToMove.size();
@@ -907,7 +905,7 @@ bool Resource::ResourceCallback::isScheduled(Resource* resource) const
 void Resource::ResourceCallback::timerFired(Timer<ResourceCallback>*)
 {
     Vector<ResourcePtr<Resource>> resources;
-    for (const auto& resource : m_resourcesWithPendingClients)
+    for (Resource* resource : m_resourcesWithPendingClients)
         resources.append(resource);
     m_resourcesWithPendingClients.clear();
 

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

@@ -165,7 +165,7 @@ static Resource* resourceFromDataURIRequest(const ResourceRequest& request, cons
     blink::WebString charset;
     RefPtr<SharedBuffer> data = PassRefPtr<SharedBuffer>(blink::Platform::current()->parseDataURL(url, mimetype, charset));
     if (!data)
-        return 0;
+        return nullptr;
     ResourceResponse response(url, mimetype, data->size(), charset, String());
 
     Resource* resource = createResource(Resource::Image, request, charset);
@@ -263,7 +263,7 @@ ResourceFetcher::ResourceFetcher(DocumentLoader* documentLoader)
 
 ResourceFetcher::~ResourceFetcher()
 {
-    m_documentLoader = 0;
+    m_documentLoader = nullptr;
     m_document = nullptr;
 
     clearPreloads();
@@ -688,16 +688,16 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
     url = MemoryCache::removeFragmentIdentifierIfNeeded(url);
 
     if (!url.isValid())
-        return 0;
+        return nullptr;
 
     if (!canRequest(type, request.resourceRequest(), url, request.options(), request.forPreload(), request.originRestriction()))
-        return 0;
+        return nullptr;
 
     if (LocalFrame* f = frame())
         f->loader().client()->dispatchWillRequestResource(&request);
 
     if (!request.forPreload()) {
-        V8DOMActivityLogger* activityLogger = 0;
+        V8DOMActivityLogger* activityLogger = nullptr;
         if (request.options().initiatorInfo.name == FetchInitiatorTypeNames::xmlhttprequest)
             activityLogger = V8DOMActivityLogger::currentActivityLogger();
         else
@@ -731,7 +731,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
     }
 
     if (!resource)
-        return 0;
+        return nullptr;
 
     if (!resource->hasClients())
         m_deadStatsRecorder.update(policy);
@@ -756,7 +756,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
         if (!shouldLoadNewResource(type)) {
             if (memoryCache()->contains(resource.get()))
                 memoryCache()->remove(resource.get());
-            return 0;
+            return nullptr;
         }
 
         if (!m_documentLoader || !m_documentLoader->scheduleArchiveLoad(resource.get(), request.resourceRequest()))
@@ -771,7 +771,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
         if (resource->errorOccurred()) {
             if (memoryCache()->contains(resource.get()))
                 memoryCache()->remove(resource.get());
-            return request.options().synchronousPolicy == RequestSynchronously ? resource : 0;
+            return request.options().synchronousPolicy == RequestSynchronously ? resource : nullptr;
         }
     }
 
@@ -1272,7 +1272,7 @@ bool ResourceFetcher::isPreloaded(const String& urlString) const
     const KURL& url = m_document->completeURL(urlString);
 
     if (m_preloads) {
-        for (const auto& resource : *m_preloads) {
+        for (Resource* resource : *m_preloads) {
             if (resource->url() == url)
                 return true;
         }
@@ -1289,7 +1289,7 @@ void ResourceFetcher::clearPreloads()
     if (!m_preloads)
         return;
 
-    for (const auto& resource : *m_preloads) {
+    for (Resource* resource : *m_preloads) {
         resource->decreasePreloadCount();
         bool deleted = resource->deleteIfPossible();
         if (!deleted && resource->preloadResult() == Resource::PreloadNotReferenced)
@@ -1463,7 +1463,7 @@ void ResourceFetcher::printPreloadStats()
     unsigned stylesheetMisses = 0;
     unsigned images = 0;
     unsigned imageMisses = 0;
-    for (const auto& resource : *m_preloads) {
+    for (Resource* resource : *m_preloads) {
         if (resource->preloadResult() == Resource::PreloadNotReferenced)
             printf("!! UNREFERENCED PRELOAD %s\n", resource->url().string().latin1().data());
         else if (resource->preloadResult() == Resource::PreloadReferencedWhileComplete)

third_party/WebKit/Source/core/fetch/ResourceFetcher.h

@@ -118,7 +118,7 @@ public:
     void setDocument(RawPtr<Document> document) { m_document = document; }
 
     DocumentLoader* documentLoader() const { return m_documentLoader; }
-    void clearDocumentLoader() { m_documentLoader = 0; }
+    void clearDocumentLoader() { m_documentLoader = nullptr; }
 
     void garbageCollectDocumentResources();