Refactor nonce support.

third_party/WebKit/Source/core/fetch/ScriptResource.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 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.
@@ skipping 14 matching lines @@
 
 #ifndef ScriptResource_h
 #define ScriptResource_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/IntegrityMetadata.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/TextResource.h"
 #include "platform/heap/Handle.h"
 #include "platform/text/CompressibleString.h"
+#include "wtf/text/AtomicString.h"
 
 namespace blink {
 
 enum class ScriptIntegrityDisposition {
     NotChecked = 0,
     Failed,
     Passed
 };
 
 class FetchRequest;
@@ skipping 34 matching lines @@
 
     bool mimeTypeAllowedByNosniff() const;
 
     void setIntegrityMetadata(const IntegrityMetadataSet& metadata) { m_integrityMetadata = metadata; }
     const IntegrityMetadataSet& integrityMetadata() const { return m_integrityMetadata; }
     // The argument must never be |NotChecked|.
     void setIntegrityDisposition(ScriptIntegrityDisposition);
     ScriptIntegrityDisposition integrityDisposition() { return m_integrityDisposition; }
     bool mustRefetchDueToIntegrityMetadata(const FetchRequest&) const override;
 
+    AtomicString contentSecurityPolicyNonce() const { return m_contentSecurityPolicyNonce; }

[jww, 2016/06/02 23:45:28]

Why are these specific to ScriptResource and not Resource (or TextResource,
perhaps)? At the very least, you'll have to repeat this for style, right?

[Mike West, 2016/06/04 06:30:56]

Thanks for catching this! It's dead code leftover from a previous iteration at
this patch, before I moved things to ResourceLoaderOptions (style is taken care
of in HTMLLinkElement.cpp).

+    void setContentSecurityPolicyNonce(const AtomicString& nonce) { m_contentSecurityPolicyNonce = nonce; }
+
 private:
     class ScriptResourceFactory : public ResourceFactory {
     public:
         ScriptResourceFactory()
             : ResourceFactory(Resource::Script) { }
 
         Resource* create(const ResourceRequest& request, const ResourceLoaderOptions& options, const String& charset) const override
         {
             return new ScriptResource(request, options, charset);
         }
     };
 
     ScriptResource(const ResourceRequest&, const ResourceLoaderOptions&, const String& charset);
 
     ScriptIntegrityDisposition m_integrityDisposition;
     IntegrityMetadataSet m_integrityMetadata;
+    AtomicString m_contentSecurityPolicyNonce;
 
     CompressibleString m_script;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Script);
 
 } // namespace blink
 
 #endif