webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 18 insertions, 24 deletions

diff --git a/Source/WebCore/workers/WorkerScriptLoader.h b/Source/WebCore/workers/WorkerScriptLoader.h
index 7b8051a13..77ce0fd7f 100644
--- a/Source/WebCore/workers/WorkerScriptLoader.h
+++ b/Source/WebCore/workers/WorkerScriptLoader.h
@@ -11,10 +11,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -22,25 +22,22 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
  */
 
-#ifndef WorkerScriptLoader_h
-#define WorkerScriptLoader_h
+#pragma once
 
 #include "URL.h"
 #include "ResourceRequest.h"
 #include "ThreadableLoader.h"
 #include "ThreadableLoaderClient.h"
-
+#include <memory>
 #include <wtf/FastMalloc.h>
-#include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
 
-    class ResourceRequest;
     class ResourceResponse;
     class ScriptExecutionContext;
     class TextResourceDecoder;
@@ -49,13 +46,13 @@ namespace WebCore {
     class WorkerScriptLoader : public RefCounted<WorkerScriptLoader>, public ThreadableLoaderClient {
         WTF_MAKE_FAST_ALLOCATED;
     public:
-        static PassRefPtr<WorkerScriptLoader> create()
+        static Ref<WorkerScriptLoader> create()
         {
-            return adoptRef(new WorkerScriptLoader());
+            return adoptRef(*new WorkerScriptLoader);
         }
 
-        void loadSynchronously(ScriptExecutionContext*, const URL&, CrossOriginRequestPolicy);
-        void loadAsynchronously(ScriptExecutionContext*, const URL&, CrossOriginRequestPolicy, WorkerScriptLoaderClient*);
+        void loadSynchronously(ScriptExecutionContext*, const URL&, FetchOptions::Mode, ContentSecurityPolicyEnforcement, const String& initiatorIdentifier);
+        void loadAsynchronously(ScriptExecutionContext*, const URL&, FetchOptions::Mode, ContentSecurityPolicyEnforcement, const String& initiatorIdentifier, WorkerScriptLoaderClient*);
 
         void notifyError();
 
@@ -65,11 +62,10 @@ namespace WebCore {
         bool failed() const { return m_failed; }
         unsigned long identifier() const { return m_identifier; }
 
-        virtual void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&) override;
-        virtual void didReceiveData(const char* data, int dataLength) override;
-        virtual void didFinishLoading(unsigned long identifier, double) override;
-        virtual void didFail(const ResourceError&) override;
-        virtual void didFailRedirectCheck() override;
+        void didReceiveResponse(unsigned long identifier, const ResourceResponse&) override;
+        void didReceiveData(const char* data, int dataLength) override;
+        void didFinishLoading(unsigned long identifier, double) override;
+        void didFail(const ResourceError&) override;
 
     private:
         friend class WTF::RefCounted<WorkerScriptLoader>;
@@ -77,21 +73,19 @@ namespace WebCore {
         WorkerScriptLoader();
         ~WorkerScriptLoader();
 
-        PassOwnPtr<ResourceRequest> createResourceRequest();
+        std::unique_ptr<ResourceRequest> createResourceRequest(const String& initiatorIdentifier);
         void notifyFinished();
 
-        WorkerScriptLoaderClient* m_client;
+        WorkerScriptLoaderClient* m_client { nullptr };
         RefPtr<ThreadableLoader> m_threadableLoader;
         String m_responseEncoding;        
         RefPtr<TextResourceDecoder> m_decoder;
         StringBuilder m_script;
         URL m_url;
         URL m_responseURL;
-        bool m_failed;
-        unsigned long m_identifier;
-        bool m_finishing;
+        unsigned long m_identifier { 0 };
+        bool m_failed { false };
+        bool m_finishing { false };
     };
 
 } // namespace WebCore
-
-#endif // WorkerScriptLoader_h