Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Unified Diff: third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h

Issue 2140523002: Remove WebURLRequest::initialize() and simplify WebURLRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mutable ref Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h
diff --git a/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h b/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h
index a81d5f79197e4262f095424ba878cfb54733886c..67277e3fa56ab58f941b4c94dd9b3e03800623ec 100644
--- a/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h
+++ b/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h
@@ -31,53 +31,28 @@
#ifndef WrappedResourceRequest_h
#define WrappedResourceRequest_h
-#include "platform/exported/WebURLRequestPrivate.h"
#include "public/platform/WebURLRequest.h"
#include "wtf/Allocator.h"
#include "wtf/Noncopyable.h"
namespace blink {
+// WrappedResourceRequest doesn't take ownership of given ResourceRequest,
+// but just holds a pointer to it. It is not copyable.
class WrappedResourceRequest : public WebURLRequest {
+ WTF_MAKE_NONCOPYABLE(WrappedResourceRequest);
public:
- ~WrappedResourceRequest()
- {
- reset(); // Need to drop reference to m_handle
- }
-
- WrappedResourceRequest() { }
-
- WrappedResourceRequest(ResourceRequest& resourceRequest)
- {
- bind(resourceRequest);
- }
+ ~WrappedResourceRequest() {}
- WrappedResourceRequest(const ResourceRequest& resourceRequest)
+ explicit WrappedResourceRequest(ResourceRequest& resourceRequest)
+ : WebURLRequest(resourceRequest)
{
- bind(resourceRequest);
}
- void bind(ResourceRequest& resourceRequest)
+ explicit WrappedResourceRequest(const ResourceRequest& resourceRequest)
+ : WrappedResourceRequest(const_cast<ResourceRequest&>(resourceRequest))
{
- m_handle.m_resourceRequest = &resourceRequest;
- assign(&m_handle);
}
-
- void bind(const ResourceRequest& resourceRequest)
- {
- bind(*const_cast<ResourceRequest*>(&resourceRequest));
- }
-
-private:
- class Handle final : public WebURLRequestPrivate {
- DISALLOW_NEW();
- public:
- Handle() { }
-
- virtual void dispose() { m_resourceRequest = 0; }
- };
-
- Handle m_handle;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698