summaryrefslogtreecommitdiff
path: root/chromium/content/browser/accessibility/captioning_controller.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-29 10:46:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-02 12:02:10 +0000
commit99677208ff3b216fdfec551fbe548da5520cd6fb (patch)
tree476a4865c10320249360e859d8fdd3e01833b03a /chromium/content/browser/accessibility/captioning_controller.cc
parentc30a6232df03e1efbd9f3b226777b07e087a1122 (diff)
downloadqtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/accessibility/captioning_controller.cc')
-rw-r--r--chromium/content/browser/accessibility/captioning_controller.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chromium/content/browser/accessibility/captioning_controller.cc b/chromium/content/browser/accessibility/captioning_controller.cc
index cc5d6b72d50..f9a5f7ea1f4 100644
--- a/chromium/content/browser/accessibility/captioning_controller.cc
+++ b/chromium/content/browser/accessibility/captioning_controller.cc
@@ -89,10 +89,7 @@ void CaptioningController::SetTextTrackSettings(
const JavaParamRef<jstring>& textTrackTextColor,
const JavaParamRef<jstring>& textTrackTextShadow,
const JavaParamRef<jstring>& textTrackTextSize) {
- auto web_prefs = web_contents()
- ->GetMainFrame()
- ->GetRenderViewHost()
- ->GetWebkitPreferences();
+ auto web_prefs = web_contents()->GetOrCreateWebPreferences();
web_prefs.text_tracks_enabled = textTracksEnabled;
web_prefs.text_track_background_color =
AddCSSImportant(ConvertJavaStringToUTF8(env, textTrackBackgroundColor));
@@ -108,8 +105,7 @@ void CaptioningController::SetTextTrackSettings(
AddCSSImportant(ConvertJavaStringToUTF8(env, textTrackTextShadow));
web_prefs.text_track_text_size =
AddCSSImportant(ConvertJavaStringToUTF8(env, textTrackTextSize));
- web_contents()->GetMainFrame()->GetRenderViewHost()->UpdateWebkitPreferences(
- web_prefs);
+ web_contents()->SetWebPreferences(web_prefs);
}
jlong JNI_CaptioningController_Init(