Chromium Code Reviews| 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..1fa99339a6d2dc202da9f470ee21c79c237a151b 100644 |
| --- a/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h |
| +++ b/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h |
| @@ -39,21 +39,19 @@ namespace blink { |
| class WrappedResourceResponse : public WebURLResponse { |
| public: |
| - ~WrappedResourceResponse() |
| - { |
| - reset(); // Need to drop reference to m_handle |
| - } |
| + ~WrappedResourceResponse() {} |
| WrappedResourceResponse() { } |
| - WrappedResourceResponse(ResourceResponse& resourceResponse) |
| + explicit WrappedResourceResponse(ResourceResponse& resourceResponse) |
| + : WebURLResponse(&m_handle) |
| + , m_handle(&resourceResponse) |
| { |
| - bind(resourceResponse); |
| } |
| - WrappedResourceResponse(const ResourceResponse& resourceResponse) |
| + explicit WrappedResourceResponse(const ResourceResponse& resourceResponse) |
| + : WrappedResourceResponse(const_cast<ResourceResponse&>(resourceResponse)) |
| { |
| - bind(resourceResponse); |
| } |
| void bind(ResourceResponse& resourceResponse) |
|
kinuko
2016/07/05 09:29:09
If code search's working correctly we no longer se
Adam Rice
2016/07/05 10:02:42
Thanks, removed.
|
| @@ -71,7 +69,12 @@ private: |
| class Handle : public WebURLResponsePrivate { |
| DISALLOW_NEW(); |
| public: |
| - virtual void dispose() { m_resourceResponse = 0; } |
| + Handle() {} |
| + explicit Handle(ResourceResponse* resourceResponse) |
| + { |
| + m_resourceResponse = resourceResponse; |
| + } |
| + void dispose() override { m_resourceResponse = 0; } |
| }; |
| Handle m_handle; |