Chromium Code Reviews| Index: third_party/WebKit/Source/core/fetch/RawResource.h |
| diff --git a/third_party/WebKit/Source/core/fetch/RawResource.h b/third_party/WebKit/Source/core/fetch/RawResource.h |
| index a2328a2bb94d93f0bed7a3baeb02696c4d0321ce..d8a0d5233db79b09cba048beb57cd9195a552438 100644 |
| --- a/third_party/WebKit/Source/core/fetch/RawResource.h |
| +++ b/third_party/WebKit/Source/core/fetch/RawResource.h |
| @@ -102,12 +102,8 @@ inline RawResource* toRawResource(Resource* resource) |
| return static_cast<RawResource*>(resource); |
| } |
| -class CORE_EXPORT RawResourceClient : public ResourceClient { |
| +class CORE_EXPORT RawResourceClient : public GarbageCollectedMixin, public ResourceClient { |
|
Nate Chapin
2016/08/03 19:37:01
Nit: I've usually seen GarbageCollecedMixin as the
yhirano
2016/08/09 07:16:44
I get an error when I specify GarbageCollecteMixin
|
| public: |
| - RawResourceClient() |
| - : m_weakFactory(this) { } |
| - WeakPtr<RawResourceClient> createWeakPtr() { return m_weakFactory.createWeakPtr(); } |
| - ~RawResourceClient() override {} |
| static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == RawResourceType; } |
| ResourceClientType getResourceClientType() const final { return RawResourceType; } |
| @@ -120,8 +116,7 @@ public: |
| virtual void dataDownloaded(Resource*, int) { } |
| virtual void didReceiveResourceTiming(Resource*, const ResourceTimingInfo&) { } |
| -private: |
| - WeakPtrFactory<RawResourceClient> m_weakFactory; |
| + DEFINE_INLINE_VIRTUAL_TRACE() {} |
| }; |
| } // namespace blink |