Commit 6e5a7d11 authored by rockot's avatar rockot Committed by Commit bot

Update browser manifest to require ProcessControl from gpu service

This adds a 'required' entry to the exe:content_browser manifest
for content::mojom::ProcessControl in exe:content_gpu, allowing
the browser to connect to the ProcessControl interface in the GPU
process.

Also fixes a bug in InterfaceRegistry which was causing useful
log errors to be omitted when capability filters would block
interface connection and registration.

BUG=624112
TBR=ben@chromium.org

Review-Url: https://codereview.chromium.org/2102353002
Cr-Commit-Position: refs/heads/master@{#402665}
parent 11d70cf2
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
"exe:content_renderer": { "exe:content_renderer": {
"interfaces": [ "content::mojom::RenderWidgetWindowTreeClientFactory" ] "interfaces": [ "content::mojom::RenderWidgetWindowTreeClientFactory" ]
}, },
"exe:content_gpu": {
"interfaces": [ "content::mojom::ProcessControl" ]
},
"mojo:shell": { "mojo:shell": {
"classes": [ "classes": [
"shell:client_process", "shell:client_process",
......
...@@ -44,7 +44,7 @@ void InterfaceRegistry::GetInterface(const mojo::String& interface_name, ...@@ -44,7 +44,7 @@ void InterfaceRegistry::GetInterface(const mojo::String& interface_name,
auto iter = name_to_binder_.find(interface_name); auto iter = name_to_binder_.find(interface_name);
if (iter != name_to_binder_.end()) { if (iter != name_to_binder_.end()) {
iter->second->BindInterface(connection_, interface_name, std::move(handle)); iter->second->BindInterface(connection_, interface_name, std::move(handle));
} else if (connection_ && connection_->AllowsInterface(interface_name)) { } else if (connection_ && !connection_->AllowsInterface(interface_name)) {
LOG(ERROR) << "Connection CapabilityFilter prevented binding to " LOG(ERROR) << "Connection CapabilityFilter prevented binding to "
<< "interface: " << interface_name << " connection_name:" << "interface: " << interface_name << " connection_name:"
<< connection_->GetConnectionName() << " remote_name:" << connection_->GetConnectionName() << " remote_name:"
......
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