Commit d660647c authored by Hiroki Nakagawa's avatar Hiroki Nakagawa Committed by Commit Bot

Loader: Remove ResourceType::kPrefetch param from the ctor of LinkFetchResource

For code cleanup, this CL removes the resource type param from the ctor
of LinkFetchResource that was always ResourceType::kPrefetch, and
instead hard-codes the resource type in the class.

Bug: 1075582
Change-Id: I2230f107968969c6df71bacd8089d1a82b1dd0fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210338Reviewed-by: default avatarYutaka Hirano <yhirano@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770943}
parent d4d30f5e
...@@ -551,8 +551,7 @@ Resource* PreloadHelper::PrefetchIfNeeded(const LinkLoadParameters& params, ...@@ -551,8 +551,7 @@ Resource* PreloadHelper::PrefetchIfNeeded(const LinkLoadParameters& params,
SignedExchangePrefetchCacheForNavigationsEnabled() || SignedExchangePrefetchCacheForNavigationsEnabled() ||
RuntimeEnabledFeatures::SignedExchangeSubresourcePrefetchEnabled( RuntimeEnabledFeatures::SignedExchangeSubresourcePrefetchEnabled(
&document)); &document));
return LinkFetchResource::Fetch(ResourceType::kLinkPrefetch, return LinkFetchResource::Fetch(link_fetch_params, document.Fetcher());
link_fetch_params, document.Fetcher());
} }
return nullptr; return nullptr;
} }
......
...@@ -10,18 +10,24 @@ ...@@ -10,18 +10,24 @@
namespace blink { namespace blink {
Resource* LinkFetchResource::Fetch(ResourceType type, Resource* LinkFetchResource::Fetch(FetchParameters& params,
FetchParameters& params,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK_EQ(type, ResourceType::kLinkPrefetch); return fetcher->RequestResource(params, LinkResourceFactory(), nullptr);
return fetcher->RequestResource(params, LinkResourceFactory(type), nullptr);
} }
LinkFetchResource::LinkFetchResource(const ResourceRequest& request, LinkFetchResource::LinkFetchResource(const ResourceRequest& request,
ResourceType type,
const ResourceLoaderOptions& options) const ResourceLoaderOptions& options)
: Resource(request, type, options) {} : Resource(request, ResourceType::kLinkPrefetch, options) {}
LinkFetchResource::~LinkFetchResource() = default; LinkFetchResource::~LinkFetchResource() = default;
LinkFetchResource::LinkResourceFactory::LinkResourceFactory()
: NonTextResourceFactory(ResourceType::kLinkPrefetch) {}
Resource* LinkFetchResource::LinkResourceFactory::Create(
const ResourceRequest& request,
const ResourceLoaderOptions& options) const {
return MakeGarbageCollected<LinkFetchResource>(request, options);
}
} // namespace blink } // namespace blink
...@@ -6,33 +6,29 @@ ...@@ -6,33 +6,29 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_RESOURCE_LINK_FETCH_RESOURCE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_RESOURCE_LINK_FETCH_RESOURCE_H_
#include "third_party/blink/renderer/platform/loader/fetch/resource.h" #include "third_party/blink/renderer/platform/loader/fetch/resource.h"
#include "third_party/blink/renderer/platform/loader/fetch/resource_client.h"
namespace blink { namespace blink {
class FetchParameters; class FetchParameters;
class ResourceFetcher; class ResourceFetcher;
// This is the implementation of Resource for <link rel='prefetch'>.
// TODO(nhiroki): Rename this to LinkPrefetchResource.
class LinkFetchResource final : public Resource { class LinkFetchResource final : public Resource {
public: public:
static Resource* Fetch(ResourceType, FetchParameters&, ResourceFetcher*); static Resource* Fetch(FetchParameters&, ResourceFetcher*);
LinkFetchResource(const ResourceRequest&, LinkFetchResource(const ResourceRequest&,
ResourceType,
const ResourceLoaderOptions&); const ResourceLoaderOptions&);
~LinkFetchResource() override; ~LinkFetchResource() override;
private: private:
class LinkResourceFactory : public NonTextResourceFactory { class LinkResourceFactory final : public NonTextResourceFactory {
public: public:
explicit LinkResourceFactory(ResourceType type) LinkResourceFactory();
: NonTextResourceFactory(type) {}
Resource* Create(const ResourceRequest& request, Resource* Create(const ResourceRequest& request,
const ResourceLoaderOptions& options) const override { const ResourceLoaderOptions& options) const override;
return MakeGarbageCollected<LinkFetchResource>(request, GetType(),
options);
}
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment