Revert of Cache SubResourceIntegrity checks at Resource

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@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.
 */
 
 #ifndef Resource_h
 #define Resource_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/CachedMetadataHandler.h"
-#include "core/fetch/IntegrityMetadata.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "platform/MemoryCoordinator.h"
 #include "platform/SharedBuffer.h"
 #include "platform/Timer.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/scheduler/CancellableTaskFactory.h"
 #include "platform/tracing/web_process_memory_dump.h"
@@ skipping 148 matching lines @@
   // the cache entry file
   virtual void finish(double finishTime);
   void finish() { finish(0.0); }
 
   // FIXME: Remove the stringless variant once all the callsites' error messages
   // are updated.
   bool passesAccessControlCheck(SecurityOrigin*) const;
   bool passesAccessControlCheck(SecurityOrigin*,
                                 String& errorDescription) const;
 
+  bool isEligibleForIntegrityCheck(SecurityOrigin*) const;
+
   virtual PassRefPtr<const SharedBuffer> resourceBuffer() const {
     return m_data;
   }
   void setResourceBuffer(PassRefPtr<SharedBuffer>);
 
   virtual bool willFollowRedirect(const ResourceRequest&,
                                   const ResourceResponse&);
 
   // Called when a redirect response was received but a decision has already
   // been made to not follow it.
@@ skipping 37 matching lines @@
     DCHECK(m_preloadCount);
     --m_preloadCount;
   }
 
   bool canReuseRedirectChain();
   bool mustRevalidateDueToCacheHeaders();
   bool canUseCacheValidator();
   bool isCacheValidator() const { return m_isRevalidating; }
   bool hasCacheControlNoStoreHeader() const;
   bool hasVaryHeader() const;
-
-  bool isEligibleForIntegrityCheck(SecurityOrigin*) const;
-
-  void setIntegrityMetadata(const IntegrityMetadataSet& metadata) {
-    m_integrityMetadata = metadata;
+  virtual bool mustRefetchDueToIntegrityMetadata(
+      const FetchRequest& request) const {
+    return false;
   }
-  const IntegrityMetadataSet& integrityMetadata() const {
-    return m_integrityMetadata;
-  }
-  // The argument must never be |NotChecked|.
-  void setIntegrityDisposition(ResourceIntegrityDisposition);
-  ResourceIntegrityDisposition integrityDisposition() const {
-    return m_integrityDisposition;
-  }
-  bool mustRefetchDueToIntegrityMetadata(const FetchRequest&) const;
 
   double currentAge() const;
   double freshnessLifetime();
   double stalenessLifetime();
 
   bool isAlive() const { return m_isAlive; }
 
   void setCacheIdentifier(const String& cacheIdentifier) {
     m_cacheIdentifier = cacheIdentifier;
   }
@@ skipping 130 matching lines @@
 
   unsigned m_preloadResult : 2;  // PreloadResult
   unsigned m_type : 4;           // Type
   unsigned m_status : 3;         // Status
 
   unsigned m_needsSynchronousCacheHit : 1;
   unsigned m_linkPreload : 1;
   bool m_isRevalidating : 1;
   bool m_isAlive : 1;
 
-  ResourceIntegrityDisposition m_integrityDisposition;
-  IntegrityMetadataSet m_integrityMetadata;
-
   // Ordered list of all redirects followed while fetching this resource.
   Vector<RedirectPair> m_redirectChain;
 
   HeapHashCountedSet<WeakMember<ResourceClient>> m_clients;
   HeapHashCountedSet<WeakMember<ResourceClient>> m_clientsAwaitingCallback;
   HeapHashCountedSet<WeakMember<ResourceClient>> m_finishedClients;
 
   ResourceLoaderOptions m_options;
 
   double m_responseTimestamp;
@@ skipping 23 matching lines @@
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName)                   \
   DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource,    \
                     resource->getType() == Resource::typeName, \
                     resource.getType() == Resource::typeName);
 
 }  // namespace blink
 
 #endif