webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 16 insertions, 28 deletions

diff --git a/Source/WebCore/loader/ThreadableLoaderClientWrapper.h b/Source/WebCore/loader/ThreadableLoaderClientWrapper.h
index 715c5aa64..602b2f295 100644
--- a/Source/WebCore/loader/ThreadableLoaderClientWrapper.h
+++ b/Source/WebCore/loader/ThreadableLoaderClientWrapper.h
@@ -28,27 +28,26 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ThreadableLoaderClientWrapper_h
-#define ThreadableLoaderClientWrapper_h
+#pragma once
 
 #include "ThreadableLoaderClient.h"
 #include <wtf/Noncopyable.h>
-#include <wtf/PassRefPtr.h>
+#include <wtf/Ref.h>
 #include <wtf/Threading.h>
 
 namespace WebCore {
 
 class ThreadableLoaderClientWrapper : public ThreadSafeRefCounted<ThreadableLoaderClientWrapper> {
 public:
-    static PassRefPtr<ThreadableLoaderClientWrapper> create(ThreadableLoaderClient* client)
+    static Ref<ThreadableLoaderClientWrapper> create(ThreadableLoaderClient& client, const String& initiator)
     {
-        return adoptRef(new ThreadableLoaderClientWrapper(client));
+        return adoptRef(*new ThreadableLoaderClientWrapper(client, initiator));
     }
 
     void clearClient()
     {
         m_done = true;
-        m_client = 0;
+        m_client = nullptr;
     }
 
     bool done() const
@@ -88,37 +87,26 @@ public:
             m_client->didFail(error);
     }
 
-    void didFailAccessControlCheck(const ResourceError& error)
-    {
-        m_done = true;
-        if (m_client)
-            m_client->didFailAccessControlCheck(error);
-    }
-
-    void didFailRedirectCheck()
-    {
-        m_done = true;
-        if (m_client)
-            m_client->didFailRedirectCheck();
-    }
-
     void didReceiveAuthenticationCancellation(unsigned long identifier, const ResourceResponse& response)
     {
         if (m_client)
             m_client->didReceiveResponse(identifier, response);
     }
 
+    const String& initiator() const { return m_initiator; }
+
 protected:
-    explicit ThreadableLoaderClientWrapper(ThreadableLoaderClient* client)
-        : m_client(client)
-        , m_done(false)
-    {
-    }
+    explicit ThreadableLoaderClientWrapper(ThreadableLoaderClient&, const String&);
 
     ThreadableLoaderClient* m_client;
-    bool m_done;
+    String m_initiator;
+    bool m_done { false };
 };
 
-} // namespace WebCore
+inline ThreadableLoaderClientWrapper::ThreadableLoaderClientWrapper(ThreadableLoaderClient& client, const String& initiator)
+    : m_client(&client)
+    , m_initiator(initiator)
+{
+}
 
-#endif // ThreadableLoaderClientWrapper_h
+} // namespace WebCore