content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java - Issue 1110103004: Hook up Android closed captions 'enabled' setting to Blink

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Issue 1110103004: Hook up Android closed captions 'enabled' setting to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Setting an enum value instead of passing down boolean to Blink Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/android/content_view_core_impl.cc ('K') | « content/common/frame_messages.h ('k') | content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java » ('j') | content/renderer/render_frame_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

index 780201fa42b75a9e352640f89b80b2f637855ffe..3811aa79642038ae57ebd22f33e5ce30e3705c29 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

@@ -2944,7 +2944,8 @@ public class ContentViewCore implements

@Override

public void onSystemCaptioningChanged(TextTrackSettings settings) {

if (mNativeContentViewCore == 0) return;

- nativeSetTextTrackSettings(mNativeContentViewCore, settings.getTextTrackBackgroundColor(),

+ nativeSetTextTrackSettings(mNativeContentViewCore,

+ settings.getTextTracksEnabled(), settings.getTextTrackBackgroundColor(),

settings.getTextTrackFontFamily(), settings.getTextTrackFontStyle(),

settings.getTextTrackFontVariant(), settings.getTextTrackTextColor(),

settings.getTextTrackTextShadow(), settings.getTextTrackTextSize());

@@ -3241,9 +3242,9 @@ public class ContentViewCore implements

long nativeContentViewCoreImpl, boolean enabled);

private native void nativeSetTextTrackSettings(long nativeContentViewCoreImpl,

- String textTrackBackgroundColor, String textTrackFontFamily, String textTrackFontStyle,

- String textTrackFontVariant, String textTrackTextColor, String textTrackTextShadow,

- String textTrackTextSize);

+ boolean textTracksEnabled, String textTrackBackgroundColor, String textTrackFontFamily,

+ String textTrackFontStyle, String textTrackFontVariant, String textTrackTextColor,

+ String textTrackTextShadow, String textTrackTextSize);

private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,

int x, int y, int w, int h);