mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to a264339194bfa02f5ecb3b8cba449 (master) (#27111)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
Electron Bot 2021-01-12 15:31:23 -08:00 • committed by GitHub
parent 1cd72425aa
commit adf0a73543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 503 additions and 460 deletions
Download patch file Download diff file Expand all files Collapse all files

45
shell/browser/ui/inspectable_web_contents.cc
View file

@ -194,12 +194,12 @@ class InspectableWebContents::NetworkResourceLoader
const network::ResourceRequest& resource_request,
const net::NetworkTrafficAnnotationTag& traffic_annotation,
URLLoaderFactoryHolder url_loader_factory,
const DispatchCallback& callback,
DispatchCallback callback,
base::TimeDelta retry_delay = base::TimeDelta()) {
auto resource_loader =
std::make_unique<InspectableWebContents::NetworkResourceLoader>(
stream_id, bindings, resource_request, traffic_annotation,
std::move(url_loader_factory), callback, retry_delay);
std::move(url_loader_factory), std::move(callback), retry_delay);
bindings->loaders_.insert(std::move(resource_loader));
}
@ -209,7 +209,7 @@ class InspectableWebContents::NetworkResourceLoader
const network::ResourceRequest& resource_request,
const net::NetworkTrafficAnnotationTag& traffic_annotation,
URLLoaderFactoryHolder url_loader_factory,
const DispatchCallback& callback,
DispatchCallback callback,
base::TimeDelta delay)
: stream_id_(stream_id),
bindings_(bindings),
@ -219,7 +219,7 @@ class InspectableWebContents::NetworkResourceLoader
std::make_unique<network::ResourceRequest>(resource_request),
traffic_annotation)),
url_loader_factory_(std::move(url_loader_factory)),
callback_(callback),
callback_(std::move(callback)),
retry_delay_(delay) {
loader_->SetOnResponseStartedCallback(base::BindOnce(
&NetworkResourceLoader::OnResponseStarted, base::Unretained(this)));
@ -280,7 +280,7 @@ class InspectableWebContents::NetworkResourceLoader
<< delay << "." << std::endl;
NetworkResourceLoader::Create(
stream_id_, bindings_, resource_request_, traffic_annotation_,
std::move(url_loader_factory_), callback_, delay);
std::move(url_loader_factory_), std::move(callback_), delay);
} else {
base::DictionaryValue response;
response.SetInteger("statusCode", response_headers_
@ -296,7 +296,7 @@ class InspectableWebContents::NetworkResourceLoader
headers->SetString(name, value);
response.Set("headers", std::move(headers));
callback_.Run(&response);
std::move(callback_).Run(&response);
}
bindings_->loaders_.erase(bindings_->loaders_.find(this));
@ -497,12 +497,12 @@ void InspectableWebContents::Detach() {
agent_host_ = nullptr;
}
void InspectableWebContents::Reattach(const DispatchCallback& callback) {
void InspectableWebContents::Reattach(DispatchCallback callback) {
if (agent_host_) {
agent_host_->DetachClient(this);
agent_host_->AttachClient(this);
}
callback.Run(nullptr);
std::move(callback).Run(nullptr);
}
void InspectableWebContents::CallClientFunction(
@ -643,16 +643,15 @@ void InspectableWebContents::InspectedURLChanged(const std::string& url) {
base::UTF8ToUTF16(base::StringPrintf(kTitleFormat, url.c_str())));
}
void InspectableWebContents::LoadNetworkResource(
const DispatchCallback& callback,
const std::string& url,
const std::string& headers,
int stream_id) {
void InspectableWebContents::LoadNetworkResource(DispatchCallback callback,
const std::string& url,
const std::string& headers,
int stream_id) {
GURL gurl(url);
if (!gurl.is_valid()) {
base::DictionaryValue response;
response.SetInteger("statusCode", 404);
callback.Run(&response);
std::move(callback).Run(&response);
return;
}
@ -696,17 +695,17 @@ void InspectableWebContents::LoadNetworkResource(
url_loader_factory = partition->GetURLLoaderFactoryForBrowserProcess();
}
NetworkResourceLoader::Create(stream_id, this, resource_request,
traffic_annotation,
std::move(url_loader_factory), callback);
NetworkResourceLoader::Create(
stream_id, this, resource_request, traffic_annotation,
std::move(url_loader_factory), std::move(callback));
}
void InspectableWebContents::SetIsDocked(const DispatchCallback& callback,
void InspectableWebContents::SetIsDocked(DispatchCallback callback,
bool docked) {
if (managed_devtools_web_contents_)
view_->SetIsDocked(docked, activate_);
if (!callback.is_null())
callback.Run(nullptr);
std::move(callback).Run(nullptr);
}
void InspectableWebContents::OpenInNewTab(const std::string& url) {}
@ -835,16 +834,16 @@ void InspectableWebContents::DispatchProtocolMessageFromDevToolsFrontend(
this, base::as_bytes(base::make_span(message)));
}
void InspectableWebContents::SendJsonRequest(const DispatchCallback& callback,
void InspectableWebContents::SendJsonRequest(DispatchCallback callback,
const std::string& browser_id,
const std::string& url) {
callback.Run(nullptr);
std::move(callback).Run(nullptr);
}
void InspectableWebContents::GetPreferences(const DispatchCallback& callback) {
void InspectableWebContents::GetPreferences(DispatchCallback callback) {
const base::DictionaryValue* prefs =
pref_service_->GetDictionary(kDevToolsPreferences);
callback.Run(prefs);
std::move(callback).Run(prefs);
}
void InspectableWebContents::SetPreference(const std::string& name,

14
shell/browser/ui/inspectable_web_contents.h
View file

@ -86,11 +86,11 @@ class InspectableWebContents
void SetInspectedPageBounds(const gfx::Rect& rect) override;
void InspectElementCompleted() override;
void InspectedURLChanged(const std::string& url) override;
void LoadNetworkResource(const DispatchCallback& callback,
void LoadNetworkResource(DispatchCallback callback,
const std::string& url,
const std::string& headers,
int stream_id) override;
void SetIsDocked(const DispatchCallback& callback, bool is_docked) override;
void SetIsDocked(DispatchCallback callback, bool is_docked) override;
void OpenInNewTab(const std::string& url) override;
void ShowItemInFolder(const std::string& file_system_path) override;
void SaveToFile(const std::string& url,
@ -130,10 +130,10 @@ class InspectableWebContents
void OpenNodeFrontend() override;
void DispatchProtocolMessageFromDevToolsFrontend(
const std::string& message) override;
void SendJsonRequest(const DispatchCallback& callback,
void SendJsonRequest(DispatchCallback callback,
const std::string& browser_id,
const std::string& url) override;
void GetPreferences(const DispatchCallback& callback) override;
void GetPreferences(DispatchCallback callback) override;
void SetPreference(const std::string& name,
const std::string& value) override;
void RemovePreference(const std::string& name) override;
@ -141,7 +141,7 @@ class InspectableWebContents
void ConnectionReady() override;
void RegisterExtensionsAPI(const std::string& origin,
const std::string& script) override;
void Reattach(const DispatchCallback& callback) override;
void Reattach(DispatchCallback callback) override;
void RecordEnumeratedHistogram(const std::string& name,
int sample,
int boundary_value) override {}
@ -150,9 +150,9 @@ class InspectableWebContents
void RecordPerformanceHistogram(const std::string& name,
double duration) override {}
void RecordUserMetricsAction(const std::string& name) override {}
void ShowSurvey(const DispatchCallback& callback,
void ShowSurvey(DispatchCallback callback,
const std::string& trigger) override {}
void CanShowSurvey(const DispatchCallback& callback,
void CanShowSurvey(DispatchCallback callback,
const std::string& trigger) override {}
// content::DevToolsFrontendHostDelegate:

5
shell/browser/ui/x/window_state_watcher.cc
View file

@ -8,6 +8,7 @@
#include "ui/base/x/x11_util.h"
#include "ui/gfx/x/x11_atom_cache.h"
#include "ui/gfx/x/xproto_util.h"
namespace electron {
@ -29,9 +30,9 @@ void WindowStateWatcher::OnEvent(const x11::Event& x11_event) {
std::vector<x11::Atom> wm_states;
if (ui::GetAtomArrayProperty(
if (GetArrayProperty(
static_cast<x11::Window>(window_->GetAcceleratedWidget()),
"_NET_WM_STATE", &wm_states)) {
x11::GetAtom("_NET_WM_STATE"), &wm_states)) {
auto props =
base::flat_set<x11::Atom>(std::begin(wm_states), std::end(wm_states));
bool is_minimized =