Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #11486 - DCHECK failure in RphFromRequest #6522

Merged
merged 1 commit into from
Aug 28, 2020
Merged

Fix #11486 - DCHECK failure in RphFromRequest #6522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...um_src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* Copyright (c) 2020 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h"

#define BRAVE_DISABLE_RPH_FROM_REQUEST \
*error = "Unsupported"; return nullptr;

#include "../../../../../../../chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc"
#undef BRAVE_DISABLE_RPH_FROM_REQUEST
4 changes: 2 additions & 2 deletions .../chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
index 32845ee2e0e9677d7d2194e31f0bb2718c925bd4..18381a3c61b45879397836f23543d1d642a3ee24 100644
index 32845ee2e0e9677d7d2194e31f0bb2718c925bd4..2146214dced7a1f54feb75b91717d876b7b7b511 100644
--- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
+++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
@@ -89,6 +89,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
const api::webrtc_logging_private::RequestInfo& request,
const std::string& security_origin,
std::string* error) {
+ return nullptr; // feature disabled in Brave
+ BRAVE_DISABLE_RPH_FROM_REQUEST //feature disabled in Brave
// There are 2 ways these API functions can get called.
//
// 1. From a whitelisted component extension on behalf of a page with the