From de3f04b7213deadca19d43c990bfe53be9b32dfb Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 20 Jan 2020 13:34:07 +0000 Subject: [PATCH] Delete TtmlStyle#inheritableStyle It's never assigned or accessed from outside the class. It was added in then the accessor was removed in PiperOrigin-RevId: 290601998 --- .../google/android/exoplayer2/text/ttml/TtmlStyle.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java index e90b099173..3a600029f5 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.text.ttml; import android.graphics.Typeface; import android.text.Layout; import androidx.annotation.IntDef; -import com.google.android.exoplayer2.util.Assertions; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -71,7 +70,6 @@ import java.lang.annotation.RetentionPolicy; @FontSizeUnit private int fontSizeUnit; private float fontSize; private String id; - private TtmlStyle inheritableStyle; private Layout.Alignment textAlign; public TtmlStyle() { @@ -101,7 +99,6 @@ import java.lang.annotation.RetentionPolicy; } public TtmlStyle setLinethrough(boolean linethrough) { - Assertions.checkState(inheritableStyle == null); this.linethrough = linethrough ? ON : OFF; return this; } @@ -111,19 +108,16 @@ import java.lang.annotation.RetentionPolicy; } public TtmlStyle setUnderline(boolean underline) { - Assertions.checkState(inheritableStyle == null); this.underline = underline ? ON : OFF; return this; } public TtmlStyle setBold(boolean bold) { - Assertions.checkState(inheritableStyle == null); this.bold = bold ? ON : OFF; return this; } public TtmlStyle setItalic(boolean italic) { - Assertions.checkState(inheritableStyle == null); this.italic = italic ? ON : OFF; return this; } @@ -133,7 +127,6 @@ import java.lang.annotation.RetentionPolicy; } public TtmlStyle setFontFamily(String fontFamily) { - Assertions.checkState(inheritableStyle == null); this.fontFamily = fontFamily; return this; } @@ -146,7 +139,6 @@ import java.lang.annotation.RetentionPolicy; } public TtmlStyle setFontColor(int fontColor) { - Assertions.checkState(inheritableStyle == null); this.fontColor = fontColor; hasFontColor = true; return this;