Commit de3f04b7 by ibaker Committed by Ian Baker

Delete TtmlStyle#inheritableStyle

It's never assigned or accessed from outside the class.

It was added in
<unknown commit>
then the accessor was removed in
<unknown commit>

PiperOrigin-RevId: 290601998
parent 0aa47c23
...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.text.ttml; ...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.text.ttml;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.text.Layout; import android.text.Layout;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import com.google.android.exoplayer2.util.Assertions;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -71,7 +70,6 @@ import java.lang.annotation.RetentionPolicy; ...@@ -71,7 +70,6 @@ import java.lang.annotation.RetentionPolicy;
@FontSizeUnit private int fontSizeUnit; @FontSizeUnit private int fontSizeUnit;
private float fontSize; private float fontSize;
private String id; private String id;
private TtmlStyle inheritableStyle;
private Layout.Alignment textAlign; private Layout.Alignment textAlign;
public TtmlStyle() { public TtmlStyle() {
...@@ -101,7 +99,6 @@ import java.lang.annotation.RetentionPolicy; ...@@ -101,7 +99,6 @@ import java.lang.annotation.RetentionPolicy;
} }
public TtmlStyle setLinethrough(boolean linethrough) { public TtmlStyle setLinethrough(boolean linethrough) {
Assertions.checkState(inheritableStyle == null);
this.linethrough = linethrough ? ON : OFF; this.linethrough = linethrough ? ON : OFF;
return this; return this;
} }
...@@ -111,19 +108,16 @@ import java.lang.annotation.RetentionPolicy; ...@@ -111,19 +108,16 @@ import java.lang.annotation.RetentionPolicy;
} }
public TtmlStyle setUnderline(boolean underline) { public TtmlStyle setUnderline(boolean underline) {
Assertions.checkState(inheritableStyle == null);
this.underline = underline ? ON : OFF; this.underline = underline ? ON : OFF;
return this; return this;
} }
public TtmlStyle setBold(boolean bold) { public TtmlStyle setBold(boolean bold) {
Assertions.checkState(inheritableStyle == null);
this.bold = bold ? ON : OFF; this.bold = bold ? ON : OFF;
return this; return this;
} }
public TtmlStyle setItalic(boolean italic) { public TtmlStyle setItalic(boolean italic) {
Assertions.checkState(inheritableStyle == null);
this.italic = italic ? ON : OFF; this.italic = italic ? ON : OFF;
return this; return this;
} }
...@@ -133,7 +127,6 @@ import java.lang.annotation.RetentionPolicy; ...@@ -133,7 +127,6 @@ import java.lang.annotation.RetentionPolicy;
} }
public TtmlStyle setFontFamily(String fontFamily) { public TtmlStyle setFontFamily(String fontFamily) {
Assertions.checkState(inheritableStyle == null);
this.fontFamily = fontFamily; this.fontFamily = fontFamily;
return this; return this;
} }
...@@ -146,7 +139,6 @@ import java.lang.annotation.RetentionPolicy; ...@@ -146,7 +139,6 @@ import java.lang.annotation.RetentionPolicy;
} }
public TtmlStyle setFontColor(int fontColor) { public TtmlStyle setFontColor(int fontColor) {
Assertions.checkState(inheritableStyle == null);
this.fontColor = fontColor; this.fontColor = fontColor;
hasFontColor = true; hasFontColor = true;
return this; return this;
......
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