| Index: third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h
|
| diff --git a/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h b/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h
|
| index 0f9c75abf5ecdbf27e72f93740ced0406c26db85..806600a663f6f85b0f4c5f110ac06fe9027e6063 100644
|
| --- a/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h
|
| +++ b/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h
|
| @@ -37,44 +37,27 @@
|
|
|
| namespace blink {
|
|
|
| +// WrappedResourceResponse doesn't take ownership of given ResourceResponse,
|
| +// but just holds a pointer to it. It is not copyable (as WebURLResponsePrivate
|
| +// is non-copyable).
|
| class WrappedResourceResponse : public WebURLResponse {
|
| public:
|
| - ~WrappedResourceResponse()
|
| - {
|
| - reset(); // Need to drop reference to m_handle
|
| - }
|
| -
|
| - WrappedResourceResponse() { }
|
| -
|
| - WrappedResourceResponse(ResourceResponse& resourceResponse)
|
| - {
|
| - bind(resourceResponse);
|
| - }
|
| + ~WrappedResourceResponse() {}
|
|
|
| - WrappedResourceResponse(const ResourceResponse& resourceResponse)
|
| - {
|
| - bind(resourceResponse);
|
| - }
|
| -
|
| - void bind(ResourceResponse& resourceResponse)
|
| + explicit WrappedResourceResponse(ResourceResponse& resourceResponse)
|
| + : WebURLResponse(&m_handle)
|
| {
|
| m_handle.m_resourceResponse = &resourceResponse;
|
| - assign(&m_handle);
|
| }
|
|
|
| - void bind(const ResourceResponse& resourceResponse)
|
| + explicit WrappedResourceResponse(const ResourceResponse& resourceResponse)
|
| + : WrappedResourceResponse(const_cast<ResourceResponse&>(resourceResponse))
|
| {
|
| - bind(*const_cast<ResourceResponse*>(&resourceResponse));
|
| }
|
|
|
| private:
|
| - class Handle : public WebURLResponsePrivate {
|
| - DISALLOW_NEW();
|
| - public:
|
| - virtual void dispose() { m_resourceResponse = 0; }
|
| - };
|
| -
|
| - Handle m_handle;
|
| + // This is pointed by m_private.
|
| + WebURLResponsePrivate m_handle;
|
| };
|
|
|
| } // namespace blink
|
|
|