move processContentSecurityPolicy to WorkerScriptLoader

Source/core/workers/WorkerScriptLoader.h

Index: Source/core/workers/WorkerScriptLoader.h
diff --git a/Source/core/workers/WorkerScriptLoader.h b/Source/core/workers/WorkerScriptLoader.h
index 5161c3c04faed902c8bf07a97ebaa79e7a84a910..f6154cc4a39abb91672961ab409f6da42f01bc24 100644
--- a/Source/core/workers/WorkerScriptLoader.h
+++ b/Source/core/workers/WorkerScriptLoader.h
@@ -41,6 +41,7 @@
 
 namespace blink {
 
+class ContentSecurityPolicy;
 class ResourceRequest;
 class ResourceResponse;
 class ExecutionContext;
@@ -74,12 +75,17 @@ public:
     PassOwnPtr<Vector<char>> releaseCachedMetadata() { return m_cachedMetadata.release(); }
     const Vector<char>* cachedMetadata() const { return m_cachedMetadata.get(); }
 
-    virtual void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
-    virtual void didReceiveData(const char* data, unsigned dataLength) override;
-    virtual void didReceiveCachedMetadata(const char*, int /*dataLength*/) override;
-    virtual void didFinishLoading(unsigned long identifier, double) override;
-    virtual void didFail(const ResourceError&) override;
-    virtual void didFailRedirectCheck() override;
+    void setContentSecurityPolicy(PassRefPtr<ContentSecurityPolicy> policy) { m_contentSecurityPolicy = policy; };

[kinuko, 2015/06/17 13:47:54]

Is this method needed?  We seem to just create a new one in
processContentSecurityPolicy.

[Takashi Toyoshima, 2015/06/18 06:23:54]

This is called from WebSharedWorkerImpl, and we do not set it in
processContentSecurityPolicy() if protocol is blob, file, and filesystem.

I think I can remove this, but it will need another review. So, I'll handle it
in a separate CL.

+    PassRefPtr<ContentSecurityPolicy> contentSecurityPolicy() { return m_contentSecurityPolicy; }
+    PassRefPtr<ContentSecurityPolicy> releaseContentSecurityPolicy() { return m_contentSecurityPolicy.release(); }
+
+    // ThreadableLoaderClient
+    void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
+    void didReceiveData(const char* data, unsigned dataLength) override;
+    void didReceiveCachedMetadata(const char*, int /*dataLength*/) override;
+    void didFinishLoading(unsigned long identifier, double) override;
+    void didFail(const ResourceError&) override;
+    void didFailRedirectCheck() override;
 
     void setRequestContext(WebURLRequest::RequestContext requestContext) { m_requestContext = requestContext; }
 
@@ -87,11 +93,13 @@ private:
     friend class WTF::RefCounted<WorkerScriptLoader>;
 
     WorkerScriptLoader();
-    virtual ~WorkerScriptLoader();
+    ~WorkerScriptLoader() override;
 
     PassOwnPtr<ResourceRequest> createResourceRequest();
     void notifyFinished();
 
+    void processContentSecurityPolicy(const ResourceResponse&);
+
     WorkerScriptLoaderClient* m_client;
     RefPtr<ThreadableLoader> m_threadableLoader;
     String m_responseEncoding;
@@ -104,6 +112,7 @@ private:
     bool m_finishing;
     OwnPtr<Vector<char>> m_cachedMetadata;
     WebURLRequest::RequestContext m_requestContext;
+    RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy;
 };
 
 } // namespace blink