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

Unified Diff: third_party/WebKit/Source/core/fetch/RawResource.h

Issue 1852663002: Oilpan: Remove WillBe types (part 9) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/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 eb19b908c7ca376289f81ea0336d881a08bbd6f3..87d9db4e65860a33458738cd7e279e7a94feaa79 100644
--- a/third_party/WebKit/Source/core/fetch/RawResource.h
+++ b/third_party/WebKit/Source/core/fetch/RawResource.h
@@ -39,18 +39,18 @@ class CORE_EXPORT RawResource final : public Resource {
public:
using ClientType = RawResourceClient;
- static PassRefPtrWillBeRawPtr<Resource> fetchSynchronously(FetchRequest&, ResourceFetcher*);
- static PassRefPtrWillBeRawPtr<RawResource> fetch(FetchRequest&, ResourceFetcher*);
- static PassRefPtrWillBeRawPtr<RawResource> fetchMainResource(FetchRequest&, ResourceFetcher*, const SubstituteData&);
- static PassRefPtrWillBeRawPtr<RawResource> fetchImport(FetchRequest&, ResourceFetcher*);
- static PassRefPtrWillBeRawPtr<RawResource> fetchMedia(FetchRequest&, ResourceFetcher*);
- static PassRefPtrWillBeRawPtr<RawResource> fetchTextTrack(FetchRequest&, ResourceFetcher*);
- static PassRefPtrWillBeRawPtr<RawResource> fetchManifest(FetchRequest&, ResourceFetcher*);
+ static RawPtr<Resource> fetchSynchronously(FetchRequest&, ResourceFetcher*);
+ static RawPtr<RawResource> fetch(FetchRequest&, ResourceFetcher*);
+ static RawPtr<RawResource> fetchMainResource(FetchRequest&, ResourceFetcher*, const SubstituteData&);
+ static RawPtr<RawResource> fetchImport(FetchRequest&, ResourceFetcher*);
+ static RawPtr<RawResource> fetchMedia(FetchRequest&, ResourceFetcher*);
+ static RawPtr<RawResource> fetchTextTrack(FetchRequest&, ResourceFetcher*);
+ static RawPtr<RawResource> fetchManifest(FetchRequest&, ResourceFetcher*);
// Exposed for testing
- static RefPtrWillBeRawPtr<RawResource> create(const ResourceRequest& request, Type type)
+ static RawPtr<RawResource> create(const ResourceRequest& request, Type type)
{
- return adoptRefWillBeNoop(new RawResource(request, type, ResourceLoaderOptions()));
+ return new RawResource(request, type, ResourceLoaderOptions());
}
// FIXME: AssociatedURLLoader shouldn't be a DocumentThreadableLoader and therefore shouldn't
@@ -66,9 +66,9 @@ private:
RawResourceFactory(Resource::Type type)
: ResourceFactory(type) { }
- 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 RawResource(request, m_type, options));
+ return new RawResource(request, m_type, options);
}
};
@@ -94,7 +94,7 @@ inline bool isRawResource(const Resource& resource)
return type == Resource::MainResource || type == Resource::Raw || type == Resource::TextTrack || type == Resource::Media || type == Resource::Manifest || type == Resource::ImportResource;
}
#endif
-inline PassRefPtrWillBeRawPtr<RawResource> toRawResource(const PassRefPtrWillBeRawPtr<Resource>& resource)
+inline RawPtr<RawResource> toRawResource(const RawPtr<Resource>& resource)
{
ASSERT_WITH_SECURITY_IMPLICATION(!resource || isRawResource(*resource.get()));
return static_cast<RawResource*>(resource.get());

Powered by Google App Engine
This is Rietveld 408576698