Commit d4e9355a authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot

Compile core/loader/ with -Wshadow.

Bug: 294205
Change-Id: Icf2da5098a87d00798cd01cf53e5ebdf04354582
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461380Reviewed-by: default avatarNate Chapin <japhet@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815643}
parent a1b8f666
......@@ -5,6 +5,8 @@
import("//third_party/blink/renderer/core/core.gni")
blink_core_sources("loader") {
configs += [ "//build/config/compiler:noshadowing" ]
sources = [
"address_space_feature.cc",
"address_space_feature.h",
......
......@@ -592,9 +592,10 @@ void ImageLoader::DoUpdateFromElement(
if (ShouldEnableSubresourceRedirect(
DynamicTo<HTMLImageElement>(GetElement()), params.Url())) {
auto& resource_request = params.MutableResourceRequest();
resource_request.SetPreviewsState(resource_request.GetPreviewsState() |
PreviewsTypes::kSubresourceRedirectOn);
auto& subresource_request = params.MutableResourceRequest();
subresource_request.SetPreviewsState(
subresource_request.GetPreviewsState() |
PreviewsTypes::kSubresourceRedirectOn);
}
new_image_content = ImageResourceContent::Fetch(params, document.Fetcher());
......
......@@ -127,14 +127,16 @@ void ResourceLoadObserverForFrame::DidReceiveResponse(
}
if (response_source == ResponseSource::kFromMemoryCache) {
ResourceRequest request(resource->GetResourceRequest());
ResourceRequest resource_request(resource->GetResourceRequest());
if (!request.Url().ProtocolIs(url::kDataScheme)) {
frame_client->DispatchDidLoadResourceFromMemoryCache(request, response);
if (!resource_request.Url().ProtocolIs(url::kDataScheme)) {
frame_client->DispatchDidLoadResourceFromMemoryCache(resource_request,
response);
frame->GetLocalFrameHostRemote().DidLoadResourceFromMemoryCache(
request.Url(), String::FromUTF8(request.HttpMethod().Utf8()),
resource_request.Url(),
String::FromUTF8(resource_request.HttpMethod().Utf8()),
String::FromUTF8(response.MimeType().Utf8()),
request.GetRequestDestination());
resource_request.GetRequestDestination());
}
// Note: probe::WillSendRequest needs to precede before this probe method.
......
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