Replace Resource::Status with ResourceStatus

third_party/WebKit/Source/platform/loader/fetch/Resource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 284 matching lines @@
 void Resource::ResourceCallback::runTask() {
   HeapVector<Member<Resource>> resources;
   for (const Member<Resource>& resource : m_resourcesWithPendingClients)
     resources.push_back(resource.get());
   m_resourcesWithPendingClients.clear();
 
   for (const auto& resource : resources)
     resource->finishPendingClients();
 }
 
-constexpr Resource::Status Resource::NotStarted;
-constexpr Resource::Status Resource::Pending;
-constexpr Resource::Status Resource::Cached;
-constexpr Resource::Status Resource::LoadError;
-constexpr Resource::Status Resource::DecodeError;
-
 Resource::Resource(const ResourceRequest& request,
                    Type type,
                    const ResourceLoaderOptions& options)
     : m_loadFinishTime(0),
       m_identifier(0),
       m_encodedSize(0),
       m_encodedSizeMemoryUsage(0),
       m_decodedSize(0),
       m_overheadSize(calculateOverheadSize()),
       m_preloadCount(0),
       m_preloadDiscoveryTime(0.0),
       m_cacheIdentifier(MemoryCache::defaultCacheIdentifier()),
       m_preloadResult(PreloadNotReferenced),
       m_type(type),
-      m_status(NotStarted),
+      m_status(ResourceStatus::NotStarted),
       m_needsSynchronousCacheHit(false),
       m_linkPreload(false),
       m_isRevalidating(false),
       m_isAlive(false),
       m_isAddRemoveClientProhibited(false),
       m_integrityDisposition(ResourceIntegrityDisposition::NotChecked),
       m_options(options),
       m_responseTimestamp(currentTime()),
       m_cancelTimer(Platform::current()->mainThread()->getWebTaskRunner(),
                     this,
@@ skipping 17 matching lines @@
   visitor->trace(m_clients);
   visitor->trace(m_clientsAwaitingCallback);
   visitor->trace(m_finishedClients);
   MemoryCoordinatorClient::trace(visitor);
 }
 
 void Resource::setLoader(ResourceLoader* loader) {
   CHECK(!m_loader);
   DCHECK(stillNeedsLoad());
   m_loader = loader;
-  m_status = Pending;
+  m_status = ResourceStatus::Pending;
 }
 
 void Resource::checkNotify() {
   if (isLoading())
     return;
 
   ResourceClientWalker<ResourceClient> w(m_clients);
   while (ResourceClient* c = w.next()) {
     markClientFinished(c);
     c->notifyFinished(this);
@@ skipping 41 matching lines @@
 
 void Resource::error(const ResourceError& error) {
   DCHECK(!error.isNull());
   m_error = error;
   m_isRevalidating = false;
 
   if (m_error.isCancellation() || !isPreloaded())
     memoryCache()->remove(this);
 
   if (!errorOccurred())
-    setStatus(LoadError);
+    setStatus(ResourceStatus::LoadError);
   DCHECK(errorOccurred());
   clearData();
   m_loader = nullptr;
   checkNotify();
 }
 
 void Resource::finish(double loadFinishTime) {
   DCHECK(!m_isRevalidating);
   m_loadFinishTime = loadFinishTime;
   if (!errorOccurred())
-    m_status = Cached;
+    m_status = ResourceStatus::Cached;
   m_loader = nullptr;
   checkNotify();
 }
 
 AtomicString Resource::httpContentType() const {
   return extractMIMETypeFromMediaType(
       response().httpHeaderField(HTTPNames::Content_Type).lower());
 }
 
 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const {
@@ skipping 122 matching lines @@
     return resourceRequest();
   return m_redirectChain.back().m_request;
 }
 
 void Resource::setRevalidatingRequest(const ResourceRequest& request) {
   SECURITY_CHECK(m_redirectChain.isEmpty());
   DCHECK(!request.isNull());
   CHECK(!m_isRevalidationStartForbidden);
   m_isRevalidating = true;
   m_resourceRequest = request;
-  m_status = NotStarted;
+  m_status = ResourceStatus::NotStarted;
 }
 
 bool Resource::willFollowRedirect(const ResourceRequest& newRequest,
                                   const ResourceResponse& redirectResponse) {
   if (m_isRevalidating)
     revalidationFailed();
   m_redirectChain.push_back(RedirectPair(newRequest, redirectResponse));
   return true;
 }
 
@@ skipping 525 matching lines @@
     case Resource::Media:
     case Resource::Manifest:
     case Resource::Mock:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace blink