Revert of Cache SubResourceIntegrity checks at Resource (patchset #2 id:20001 of https://codereview…

third_party/WebKit/Source/core/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
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "core/fetch/Resource.h"
 
 #include "core/fetch/CachedMetadata.h"
 #include "core/fetch/CrossOriginAccessControl.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
-#include "core/fetch/FetchRequest.h"
-#include "core/fetch/IntegrityMetadata.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/ResourceClientWalker.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/inspector/InstanceCounters.h"
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/SharedBuffer.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/tracing/TraceEvent.h"
@@ skipping 266 matching lines @@
       m_preloadCount(0),
       m_preloadDiscoveryTime(0.0),
       m_cacheIdentifier(MemoryCache::defaultCacheIdentifier()),
       m_preloadResult(PreloadNotReferenced),
       m_type(type),
       m_status(NotStarted),
       m_needsSynchronousCacheHit(false),
       m_linkPreload(false),
       m_isRevalidating(false),
       m_isAlive(false),
-      m_integrityDisposition(ResourceIntegrityDisposition::NotChecked),
       m_isAddRemoveClientProhibited(false),
       m_options(options),
       m_responseTimestamp(currentTime()),
       m_cancelTimer(this, &Resource::cancelTimerFired),
       m_resourceRequest(request) {
   // m_type is a bitfield, so this tests careless updates of the enum.
   DCHECK_EQ(m_type, unsigned(type));
   InstanceCounters::incrementCounter(InstanceCounters::ResourceCounter);
 
   // Currently we support the metadata caching only for HTTP family.
@@ skipping 116 matching lines @@
       securityOrigin, errorDescription, lastResourceRequest().requestContext());
 }
 
 bool Resource::isEligibleForIntegrityCheck(
     SecurityOrigin* securityOrigin) const {
   String ignoredErrorDescription;
   return securityOrigin->canRequest(resourceRequest().url()) ||
          passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
 }
 
-void Resource::setIntegrityDisposition(
-    ResourceIntegrityDisposition disposition) {
-  DCHECK_NE(disposition, ResourceIntegrityDisposition::NotChecked);
-  DCHECK(m_type == Resource::Script);
-  m_integrityDisposition = disposition;
-}
-
-bool Resource::mustRefetchDueToIntegrityMetadata(
-    const FetchRequest& request) const {
-  if (request.integrityMetadata().isEmpty())
-    return false;
-
-  return !IntegrityMetadata::setsEqual(m_integrityMetadata,
-                                       request.integrityMetadata());
-}
-
 static double currentAge(const ResourceResponse& response,
                          double responseTimestamp) {
   // RFC2616 13.2.3
   // No compensation for latency as that is not terribly important in practice
   double dateValue = response.date();
   double apparentAge = std::isfinite(dateValue)
                            ? std::max(0., responseTimestamp - dateValue)
                            : 0;
   double ageValue = response.age();
   double correctedReceivedAge =
@@ skipping 616 matching lines @@
     case Resource::TextTrack:
     case Resource::Media:
     case Resource::Manifest:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace blink