b0f315a637
* chore: bump chromium in DEPS to 98.0.4726.0 * 3292117: Remove unneeded base/compiler_specific.h includes in //chrome. https://chromium-review.googlesource.com/c/chromium/src/+/3292117 * 3289198: Enables calculating line, word and sentence boundaries on the browser https://chromium-review.googlesource.com/c/chromium/src/+/3289198 * 3276176: Remove expired gdi-text-printing flag and associated code. https://chromium-review.googlesource.com/c/chromium/src/+/3276176 * 3240963: content: allow embedder to prevent locking scheme registry https://chromium-review.googlesource.com/c/chromium/src/+/3240963 * 3269899: Rename WebContentsImpl::GetFrameTree to GetPrimaryFrameTree https://chromium-review.googlesource.com/c/chromium/src/+/3269899 * chore: fixup patch indices * 3276279: Enable -Wshadow by default for the "chromium code" config. https://chromium-review.googlesource.com/c/chromium/src/+/3276279 * 3279737: appcache: Remove WebPreference/WebSetting https://chromium-review.googlesource.com/c/chromium/src/+/3279737 * 3275564: [api] Advance API deprecation for APIs last marked in v9.6 https://chromium-review.googlesource.com/c/v8/v8/+/3275564 * 3261873: Clean up WebScriptSource constructors https://chromium-review.googlesource.com/c/chromium/src/+/3261873 * 3279346: appcache: Remove ConsoleMessage appcache field https://chromium-review.googlesource.com/c/chromium/src/+/3279346 * 3264212: Move legacy file loading to legacy_test_runner https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3264212 Both Persistence and UI have been removed from globals, but the issues they seemed to be patching are no longer reproducible from what I can tell, and so we can just delete these and re-evaluate if something surfaces. * 3290415: x11: remove the USE_X11 define. https://chromium-review.googlesource.com/c/chromium/src/+/3290415 * chore: bump Chromium to 98.0.4728.0 * 3179530: Defer system calls in PrintingContext for OOP printing https://chromium-review.googlesource.com/c/chromium/src/+/3179530 * 3299445: Consolidate is_win conditionals in chrome/test/BUILD.gn. https://chromium-review.googlesource.com/c/chromium/src/+/3299445 * chore: update patch indices * 3223975: Break PrintJobWorker OOP logic into separate class https://chromium-review.googlesource.com/c/chromium/src/+/3223975 * chore: bump chromium in DEPS to 98.0.4730.0 * 3279001: Remove support for font-family: -webkit-pictograph https://chromium-review.googlesource.com/c/chromium/src/+/3279001 * chore: fixup patch indices * chore: bump chromium in DEPS to 98.0.4732.0 * chore: update patches * chore: bump chromium in DEPS to 98.0.4734.0 * chore: bump chromium in DEPS to 98.0.4736.0 * chore: update patches * chore: update printing patch for miracle ptr * chore: add noexcept to fix clang error * chore: bump chromium in DEPS to 98.0.4738.0 * chore: update patches * chore: bump chromium in DEPS to 98.0.4740.0 * chore: bump chromium in DEPS to 98.0.4742.0 * chore: bump chromium in DEPS to 98.0.4744.0 * chore: bump chromium in DEPS to 98.0.4746.0 * chore: bump chromium in DEPS to 98.0.4748.0 * chore: bump chromium in DEPS to 98.0.4750.0 * chore: update patches * 3293841: Remove File Handling permissions code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3293841 * chore: update patches 3311700: Move the PpapiPluginSandboxedProcessLauncherDelegate | https://chromium-review.googlesource.com/c/chromium/src/+/3311700 * 3289260: [CodeHealth]: Remove uses of Notification Service Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3289260 * 3301600: Disable scripted print in fenced frames Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3301600 * chore: add missing thread_restrictions headers * 3305132: Rewrite most `Foo* field_` pointer fields to `raw_ptr<Foo> field_`. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3305132 * fix: add ppapi_sandbox header for linux 3311700: Move the PpapiPluginSandboxedProcessLauncherDelegate | https://chromium-review.googlesource.com/c/chromium/src/+/3311700 * chore: manually bump chromium in DEPS to 98.0.4757.0 * chore: update patches * 3321044: Remove DictionaryValue::Clear() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3321044 * chore: update printing.patch Refs: - 3304556: [code health] Remove notification observation from PrintJob. | https://chromium-review.googlesource.com/c/chromium/src/+/3304556 - 3305095: [code health] Remove NotificationService from PrintViewManagerBase. | https://chromium-review.googlesource.com/c/chromium/src/+/3305095 * build: add v8-embedder-state headers to GN patch * chore: bump chromium in DEPS to 99.0.4767.0 * chore: update patches * chore: rename CookiePartitionKeychain ...to CookiePartitionKeyCollection * chore: update video consumers * refactor: use newer base::Value API * 3232598: Convert net::DnsOverHttpsServerConfig into a class | https://chromium-review.googlesource.com/c/chromium/src/+/3232598 * 3327865: Remove the default WebContentsUserData ctor. | https://chromium-review.googlesource.com/c/chromium/src/+/3327865 * 3302814: DevTools: Add getPreference binding | https://chromium-review.googlesource.com/c/chromium/src/+/3302814 * 3301474: [tq][runtime] Use build flags for JS context promise hooks | https://chromium-review.googlesource.com/c/v8/v8/+/3301474 * oops 😵💫 * 3272411: Reland "base/allocator: Enable PartitionAlloc-Everywhere on macOS" | https://chromium-review.googlesource.com/c/chromium/src/+/3272411 build: turn PartitionAlloc back off on mac for now * fix: WCO method got renamed * 3344749: Revert "Stop using NSRunLoop in renderer process" https://chromium-review.googlesource.com/c/chromium/src/+/3344749 * 3288746: [serial] Fix BluetoothSerialDeviceEnumerator threading issues. https://chromium-review.googlesource.com/c/chromium/src/+/3288746 * Revert "3288746: [serial] Fix BluetoothSerialDeviceEnumerator threading issues." This reverts commit 5cc69f102e43ca72ac9ef45063711bcc7d849740. * chore: disable serial device enumerator sequence dcheck * fix: comment out line in DeviceService dtor * fixup! 3279001: Remove support for font-family: -webkit-pictograph * fixup! 3279346: appcache: Remove ConsoleMessage appcache field * chore: update patches after rebase Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
101 lines
3.3 KiB
C++
101 lines
3.3 KiB
C++
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/net/resolve_proxy_helper.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/storage_partition.h"
|
|
#include "mojo/public/cpp/bindings/pending_remote.h"
|
|
#include "net/proxy_resolution/proxy_info.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
|
|
using content::BrowserThread;
|
|
|
|
namespace electron {
|
|
|
|
ResolveProxyHelper::ResolveProxyHelper(ElectronBrowserContext* browser_context)
|
|
: browser_context_(browser_context) {}
|
|
|
|
ResolveProxyHelper::~ResolveProxyHelper() {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
DCHECK(!owned_self_);
|
|
DCHECK(!receiver_.is_bound());
|
|
// Clear all pending requests if the ProxyService is still alive.
|
|
pending_requests_.clear();
|
|
}
|
|
|
|
void ResolveProxyHelper::ResolveProxy(const GURL& url,
|
|
ResolveProxyCallback callback) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
// Enqueue the pending request.
|
|
pending_requests_.emplace_back(url, std::move(callback));
|
|
|
|
// If nothing is in progress, start.
|
|
if (!receiver_.is_bound()) {
|
|
DCHECK_EQ(1u, pending_requests_.size());
|
|
StartPendingRequest();
|
|
}
|
|
}
|
|
|
|
void ResolveProxyHelper::StartPendingRequest() {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
DCHECK(!receiver_.is_bound());
|
|
DCHECK(!pending_requests_.empty());
|
|
|
|
// Start the request.
|
|
mojo::PendingRemote<network::mojom::ProxyLookupClient> proxy_lookup_client =
|
|
receiver_.BindNewPipeAndPassRemote();
|
|
receiver_.set_disconnect_handler(
|
|
base::BindOnce(&ResolveProxyHelper::OnProxyLookupComplete,
|
|
base::Unretained(this), net::ERR_ABORTED, absl::nullopt));
|
|
browser_context_->GetDefaultStoragePartition()
|
|
->GetNetworkContext()
|
|
->LookUpProxyForURL(pending_requests_.front().url,
|
|
net::NetworkIsolationKey(),
|
|
std::move(proxy_lookup_client));
|
|
}
|
|
|
|
void ResolveProxyHelper::OnProxyLookupComplete(
|
|
int32_t net_error,
|
|
const absl::optional<net::ProxyInfo>& proxy_info) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
DCHECK(!pending_requests_.empty());
|
|
|
|
receiver_.reset();
|
|
|
|
// Clear the current (completed) request.
|
|
PendingRequest completed_request = std::move(pending_requests_.front());
|
|
pending_requests_.pop_front();
|
|
|
|
std::string proxy;
|
|
if (proxy_info)
|
|
proxy = proxy_info->ToPacString();
|
|
|
|
if (!completed_request.callback.is_null())
|
|
std::move(completed_request.callback).Run(proxy);
|
|
|
|
// Start the next request.
|
|
if (!pending_requests_.empty())
|
|
StartPendingRequest();
|
|
}
|
|
|
|
ResolveProxyHelper::PendingRequest::PendingRequest(
|
|
const GURL& url,
|
|
ResolveProxyCallback callback)
|
|
: url(url), callback(std::move(callback)) {}
|
|
|
|
ResolveProxyHelper::PendingRequest::PendingRequest(
|
|
ResolveProxyHelper::PendingRequest&& pending_request) noexcept = default;
|
|
|
|
ResolveProxyHelper::PendingRequest::~PendingRequest() noexcept = default;
|
|
|
|
ResolveProxyHelper::PendingRequest&
|
|
ResolveProxyHelper::PendingRequest::operator=(
|
|
ResolveProxyHelper::PendingRequest&& pending_request) noexcept = default;
|
|
|
|
} // namespace electron
|