Commit 9cfc75ff by ibaker Committed by Ian Baker

Fix warning about adjacent overload methods in TtmlStyle

PiperOrigin-RevId: 290610936
parent f7470c51
...@@ -166,24 +166,24 @@ import java.lang.annotation.RetentionPolicy; ...@@ -166,24 +166,24 @@ import java.lang.annotation.RetentionPolicy;
} }
/** /**
* Inherits from an ancestor style. Properties like <i>tts:backgroundColor</i> which * Chains this style to referential style. Local properties which are already set are never
* are not inheritable are not inherited as well as properties which are already set locally * overridden.
* are never overridden.
* *
* @param ancestor the ancestor style to inherit from * @param ancestor the referential style to inherit from
*/ */
public TtmlStyle inherit(TtmlStyle ancestor) { public TtmlStyle chain(TtmlStyle ancestor) {
return inherit(ancestor, false); return inherit(ancestor, true);
} }
/** /**
* Chains this style to referential style. Local properties which are already set * Inherits from an ancestor style. Properties like <i>tts:backgroundColor</i> which are not
* are never overridden. * inheritable are not inherited as well as properties which are already set locally are never
* overridden.
* *
* @param ancestor the referential style to inherit from * @param ancestor the ancestor style to inherit from
*/ */
public TtmlStyle chain(TtmlStyle ancestor) { public TtmlStyle inherit(TtmlStyle ancestor) {
return inherit(ancestor, true); return inherit(ancestor, false);
} }
private TtmlStyle inherit(TtmlStyle ancestor, boolean chaining) { private TtmlStyle inherit(TtmlStyle ancestor, boolean chaining) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment