summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-03 17:01:36 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-03 15:09:12 +0000
commitc3ca1603da9b89f772e2360be4f95702c845e233 (patch)
tree2b128f25be579dbdceea2de2afa713d4597daa82
parent01d0a78c93cc4b07ec5986476ef5a5af0196a5f4 (diff)
downloadqtwebengine-chromium-c3ca1603da9b89f772e2360be4f95702c845e233.tar.gz
FIXUP: Bring enable_webrtc back
Change-Id: I7c0a85e1fa266334d13051e37885f982e26c9368 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/content/renderer/renderer_blink_platform_impl.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/content/renderer/renderer_blink_platform_impl.cc b/chromium/content/renderer/renderer_blink_platform_impl.cc
index c7e8e9533a9..a87134719f6 100644
--- a/chromium/content/renderer/renderer_blink_platform_impl.cc
+++ b/chromium/content/renderer/renderer_blink_platform_impl.cc
@@ -907,6 +907,7 @@ void RendererBlinkPlatformImpl::UpdateWebRTCAPICount(
base::Optional<double>
RendererBlinkPlatformImpl::GetWebRtcMaxCaptureFrameRate() {
+#if BUILDFLAG(ENABLE_WEBRTC)
const std::string max_fps_str =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kWebRtcMaxCaptureFramerate);
@@ -915,6 +916,7 @@ RendererBlinkPlatformImpl::GetWebRtcMaxCaptureFrameRate() {
if (base::StringToDouble(max_fps_str, &value) && value >= 0.0)
return value;
}
+#endif
return base::nullopt;
}
@@ -1122,11 +1124,15 @@ blink::WebPushProvider* RendererBlinkPlatformImpl::PushProvider() {
blink::WebTransmissionEncodingInfoHandler*
RendererBlinkPlatformImpl::TransmissionEncodingInfoHandler() {
+#if BUILDFLAG(ENABLE_WEBRTC)
if (!web_transmission_encoding_info_handler_) {
web_transmission_encoding_info_handler_.reset(
new content::TransmissionEncodingInfoHandler());
}
return web_transmission_encoding_info_handler_.get();
+#else
+ return nullptr;
+#endif
}
//------------------------------------------------------------------------------