From c0419ae89fbc4fbdc58aef5b8b01ab0b45f8ff98 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 23 Aug 2018 18:26:28 +0200 Subject: Adaptations for Chromium 68 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Together-with: Tamas Zakor Change-Id: I805246b6f01cb151fff48588744408c676d87c14 Reviewed-by: Michael Brüning --- src/core/renderer/content_renderer_client_qt.cpp | 10 +++++++--- src/core/renderer/render_view_observer_qt.cpp | 6 ------ src/core/renderer/render_view_observer_qt.h | 1 - src/core/renderer/user_resource_controller.cpp | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) (limited to 'src/core/renderer') diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index e9f404cb1..0466bfeb4 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -311,9 +311,11 @@ static void AddExternalClearKey(std::vector supported_video_codecs; bool supports_persistent_license; + std::vector supported_encryption_schemes; if (!content::IsKeySystemSupported(kExternalClearKeyKeySystem, &supported_video_codecs, - &supports_persistent_license)) { + &supports_persistent_license, + &supported_encryption_schemes)) { return; } @@ -373,9 +375,11 @@ static void AddWidevine(std::vector> { std::vector supported_video_codecs; bool supports_persistent_license = false; + std::vector supported_encryption_schemes; if (!content::IsKeySystemSupported(kWidevineKeySystem, &supported_video_codecs, - &supports_persistent_license)) { + &supports_persistent_license, + &supported_encryption_schemes)) { DVLOG(1) << "Widevine CDM is not currently available."; return; } @@ -417,7 +421,7 @@ static void AddWidevine(std::vector> using Robustness = cdm::WidevineKeySystemProperties::Robustness; concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties( - supported_codecs, + supported_encryption_schemes, supported_codecs, Robustness::SW_SECURE_CRYPTO, // Maximum audio robustness. Robustness::SW_SECURE_DECODE, // Maximum video robustness. persistent_license_support, // persistent-license. diff --git a/src/core/renderer/render_view_observer_qt.cpp b/src/core/renderer/render_view_observer_qt.cpp index d37b67ebc..07dadfd40 100644 --- a/src/core/renderer/render_view_observer_qt.cpp +++ b/src/core/renderer/render_view_observer_qt.cpp @@ -78,11 +78,6 @@ void RenderViewObserverQt::onFetchDocumentInnerText(quint64 requestId) Send(new RenderViewObserverHostQt_DidFetchDocumentInnerText(routing_id(), requestId, text.Utf16())); } -void RenderViewObserverQt::onSetBackgroundColor(quint32 color) -{ - render_view()->GetWebFrameWidget()->SetBaseBackgroundColor(color); -} - void RenderViewObserverQt::OnDestruct() { delete this; @@ -94,7 +89,6 @@ bool RenderViewObserverQt::OnMessageReceived(const IPC::Message& message) IPC_BEGIN_MESSAGE_MAP(RenderViewObserverQt, message) IPC_MESSAGE_HANDLER(RenderViewObserverQt_FetchDocumentMarkup, onFetchDocumentMarkup) IPC_MESSAGE_HANDLER(RenderViewObserverQt_FetchDocumentInnerText, onFetchDocumentInnerText) - IPC_MESSAGE_HANDLER(RenderViewObserverQt_SetBackgroundColor, onSetBackgroundColor) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; diff --git a/src/core/renderer/render_view_observer_qt.h b/src/core/renderer/render_view_observer_qt.h index abb472f02..83c0cd265 100644 --- a/src/core/renderer/render_view_observer_qt.h +++ b/src/core/renderer/render_view_observer_qt.h @@ -55,7 +55,6 @@ public: private: void onFetchDocumentMarkup(quint64 requestId); void onFetchDocumentInnerText(quint64 requestId); - void onSetBackgroundColor(quint32 color); void OnDestruct() override; diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp index b8cf8b077..920fda72e 100644 --- a/src/core/renderer/user_resource_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -209,7 +209,7 @@ void UserResourceController::runScripts(UserScriptData::InjectionPoint p, blink: continue; blink::WebScriptSource source(blink::WebString::FromUTF8(script.source), script.url); if (script.worldId) - frame->ExecuteScriptInIsolatedWorld(script.worldId, &source, /*numSources = */1); + frame->ExecuteScriptInIsolatedWorld(script.worldId, source); else frame->ExecuteScript(source); } -- cgit v1.2.3