| Index: third_party/WebKit/Source/core/fetch/DocumentResource.h
|
| diff --git a/third_party/WebKit/Source/core/fetch/DocumentResource.h b/third_party/WebKit/Source/core/fetch/DocumentResource.h
|
| index e4315e58b5fa372cdc974c9477f052e16928cbae..6cf678bc690195b4466d0706ff45a8abf5b735ae 100644
|
| --- a/third_party/WebKit/Source/core/fetch/DocumentResource.h
|
| +++ b/third_party/WebKit/Source/core/fetch/DocumentResource.h
|
| @@ -37,7 +37,7 @@ class CORE_EXPORT DocumentResource final : public Resource {
|
| public:
|
| using ClientType = ResourceClient;
|
|
|
| - static PassRefPtrWillBeRawPtr<DocumentResource> fetchSVGDocument(FetchRequest&, ResourceFetcher*);
|
| + static RawPtr<DocumentResource> fetchSVGDocument(FetchRequest&, ResourceFetcher*);
|
| ~DocumentResource() override;
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -53,22 +53,22 @@ private:
|
| SVGDocumentResourceFactory()
|
| : ResourceFactory(Resource::SVGDocument) { }
|
|
|
| - PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, const ResourceLoaderOptions& options, const String& charset) const override
|
| + RawPtr<Resource> create(const ResourceRequest& request, const ResourceLoaderOptions& options, const String& charset) const override
|
| {
|
| - return adoptRefWillBeNoop(new DocumentResource(request, Resource::SVGDocument, options));
|
| + return new DocumentResource(request, Resource::SVGDocument, options);
|
| }
|
| };
|
| DocumentResource(const ResourceRequest&, Type, const ResourceLoaderOptions&);
|
|
|
| bool mimeTypeAllowed() const;
|
| - PassRefPtrWillBeRawPtr<Document> createDocument(const KURL&);
|
| + RawPtr<Document> createDocument(const KURL&);
|
|
|
| - RefPtrWillBeMember<Document> m_document;
|
| + Member<Document> m_document;
|
| OwnPtr<TextResourceDecoder> m_decoder;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(DocumentResource, Resource, resource, resource->getType() == Resource::SVGDocument, resource.getType() == Resource::SVGDocument); \
|
| -inline DocumentResource* toDocumentResource(const RefPtrWillBeRawPtr<Resource>& ptr) { return toDocumentResource(ptr.get()); }
|
| +inline DocumentResource* toDocumentResource(const RawPtr<Resource>& ptr) { return toDocumentResource(ptr.get()); }
|
|
|
| class CORE_EXPORT DocumentResourceClient : public ResourceClient {
|
| public:
|
|
|