Simplify URLRequestCustomJob handling

Improve implementation of URLRequestCustomJob:

* remove qmutex, pass values using PostTask
* do not use base::WeakPtr which is not thread safe and must
  always be dereferenced on the same thread
* add proxy object to handle interactions between threads
* do not use QPointer to track IODevice since it does not solve
  anything for us
* QIODevice in reply method is used only by IO thread
* do not make shared object to commit suicide,
  instead use refcounted object
* improve documentation about thread safety issue of QIODevice
  object in reply method

Change-Id: Ic29bf262de8082dfd46cb9217a68f3c982d16b9e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 8 insertions, 4 deletions

diff --git a/src/core/url_request_custom_job_delegate.h b/src/core/url_request_custom_job_delegate.h
index 732ff8d7a..eb99f3576 100644
--- a/src/core/url_request_custom_job_delegate.h
+++ b/src/core/url_request_custom_job_delegate.h
@@ -40,6 +40,7 @@
 #ifndef URL_REQUEST_CUSTOM_JOB_DELEGATE_H_
 #define URL_REQUEST_CUSTOM_JOB_DELEGATE_H_
 
+#include "base/memory/ref_counted.h"
 #include "qtwebenginecoreglobal.h"
 
 #include <QObject>
@@ -68,17 +69,20 @@ public:
     QUrl url() const;
     QByteArray method() const;
 
-    void setReply(const QByteArray &contentType, QIODevice *device);
+    void reply(const QByteArray &contentType, QIODevice *device);
     void redirect(const QUrl& url);
     void abort();
-
     void fail(Error);
 
 private:
-    URLRequestCustomJobDelegate(URLRequestCustomJobProxy *proxy);
+    URLRequestCustomJobDelegate(URLRequestCustomJobProxy *proxy,
+                                const QUrl &url,
+                                const QByteArray &method);
 
     friend class URLRequestCustomJobProxy;
-    URLRequestCustomJobProxy *m_proxy;
+    scoped_refptr<URLRequestCustomJobProxy> m_proxy;
+    QUrl m_request;
+    QByteArray m_method;
 };
 
 } // namespace