| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/child/web_url_loader_impl.h" | 5 #include "content/child/web_url_loader_impl.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 resource_request->resource_body_stream_url = stream_override_->stream_url; | 613 resource_request->resource_body_stream_url = stream_override_->stream_url; |
| 614 } | 614 } |
| 615 } | 615 } |
| 616 | 616 |
| 617 // PlzNavigate: Invalid renderer main resource requests are rejected by the | 617 // PlzNavigate: Invalid renderer main resource requests are rejected by the |
| 618 // browser. This should not happen. | 618 // browser. This should not happen. |
| 619 // TODO(arthursonzogni): Remove this when the root cause for | 619 // TODO(arthursonzogni): Remove this when the root cause for |
| 620 // https://crbug.com/705508 is found. | 620 // https://crbug.com/705508 is found. |
| 621 if (IsBrowserSideNavigationEnabled() && | 621 if (IsBrowserSideNavigationEnabled() && |
| 622 IsResourceTypeFrame(resource_request->resource_type) && | 622 IsResourceTypeFrame(resource_request->resource_type) && |
| 623 !resource_request->resource_body_stream_url.SchemeIs(url::kBlobScheme)) { | 623 !resource_request->resource_body_stream_url.SchemeIs(url::kBlobScheme) && |
| 624 !consumer_handle.is_valid()) { |
| 624 base::debug::DumpWithoutCrashing(); | 625 base::debug::DumpWithoutCrashing(); |
| 625 } | 626 } |
| 626 | 627 |
| 627 const RequestExtraData empty_extra_data; | 628 const RequestExtraData empty_extra_data; |
| 628 const RequestExtraData* extra_data; | 629 const RequestExtraData* extra_data; |
| 629 if (request.GetExtraData()) | 630 if (request.GetExtraData()) |
| 630 extra_data = static_cast<RequestExtraData*>(request.GetExtraData()); | 631 extra_data = static_cast<RequestExtraData*>(request.GetExtraData()); |
| 631 else | 632 else |
| 632 extra_data = &empty_extra_data; | 633 extra_data = &empty_extra_data; |
| 633 extra_data->CopyToResourceRequest(resource_request.get()); | 634 extra_data->CopyToResourceRequest(resource_request.get()); |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1278 int intra_priority_value) { | 1279 int intra_priority_value) { |
| 1279 context_->DidChangePriority(new_priority, intra_priority_value); | 1280 context_->DidChangePriority(new_priority, intra_priority_value); |
| 1280 } | 1281 } |
| 1281 | 1282 |
| 1282 void WebURLLoaderImpl::SetLoadingTaskRunner( | 1283 void WebURLLoaderImpl::SetLoadingTaskRunner( |
| 1283 base::SingleThreadTaskRunner* loading_task_runner) { | 1284 base::SingleThreadTaskRunner* loading_task_runner) { |
| 1284 context_->SetTaskRunner(loading_task_runner); | 1285 context_->SetTaskRunner(loading_task_runner); |
| 1285 } | 1286 } |
| 1286 | 1287 |
| 1287 } // namespace content | 1288 } // namespace content |
| OLD | NEW |