Changeset 280695 in webkit

Timestamp:

Aug 5, 2021, 9:26:58 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r280648. rdar://problem/81568979

REGRESSION(?): subtitle text sizing is sometimes inconsistent
​https://bugs.webkit.org/show_bug.cgi?id=228786
<rdar://problem/80525509>

Reviewed by Eric Carlson.

Tested manually. I'm still not 100% sure of the root cause of this, but after talking with
some folks more familiar with WebKit's media "stack" it seems like this only happens with
in-band non-VTT subtitle tracks that have their own styling. The fix is also pretty obvious.

• html/track/TextTrackCueGeneric.cpp: (WebCore::TextTrackCueGeneric::setFontSize): We should still pass along the new font size (and bool important) even if we don't have a display tree yet, as the font size (and bool important) are used when the display tree is created, meaning that we shouldn't have to wait for another setFontSize call after the display tree is created in order to update the font size.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@280648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612.1.27.0-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/track/TextTrackCueGeneric.cpp (modified) (1 diff)

branches/safari-612.1.27.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-05  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r280648. rdar://problem/81568979
+
+    REGRESSION(?): subtitle text sizing is sometimes inconsistent
+    https://bugs.webkit.org/show_bug.cgi?id=228786
+    <rdar://problem/80525509>
+    
+    Reviewed by Eric Carlson.
+    
+    Tested manually. I'm still not 100% sure of the root cause of this, but after talking with
+    some folks more familiar with WebKit's media "stack" it seems like this only happens with
+    in-band non-VTT subtitle tracks that have their own styling. The fix is also pretty obvious.
+    
+    * html/track/TextTrackCueGeneric.cpp:
+    (WebCore::TextTrackCueGeneric::setFontSize):
+    We should still pass along the new font size (and `bool important`) even if we don't have a
+    display tree yet, as the font size (and `bool important`) are used when the display tree is
+    created, meaning that we shouldn't have to wait for another `setFontSize` call after the
+    display tree is created in order to update the font size.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280648 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-04  Devin Rousso  <drousso@apple.com>
+
+            REGRESSION(?): subtitle text sizing is sometimes inconsistent
+            https://bugs.webkit.org/show_bug.cgi?id=228786
+            <rdar://problem/80525509>
+
+            Reviewed by Eric Carlson.
+
+            Tested manually. I'm still not 100% sure of the root cause of this, but after talking with
+            some folks more familiar with WebKit's media "stack" it seems like this only happens with
+            in-band non-VTT subtitle tracks that have their own styling. The fix is also pretty obvious.
+
+            * html/track/TextTrackCueGeneric.cpp:
+            (WebCore::TextTrackCueGeneric::setFontSize):
+            We should still pass along the new font size (and `bool important`) even if we don't have a
+            display tree yet, as the font size (and `bool important`) are used when the display tree is
+            created, meaning that we shouldn't have to wait for another `setFontSize` call after the
+            display tree is created in order to update the font size.
+
 2021-08-05  Russell Epstein  <repstein@apple.com>
 

branches/safari-612.1.27.0-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp

@@ -195 +195 @@
 void TextTrackCueGeneric::setFontSize(int fontSize, const IntSize& videoSize, bool important)
 {
-    if (!hasDisplayTree() || !fontSize)
+    if (!fontSize)
         return;
     
-    if (important || !baseFontSizeRelativeToVideoHeight()) {
+    if (important || !hasDisplayTree() || !baseFontSizeRelativeToVideoHeight()) {
         VTTCue::setFontSize(fontSize, videoSize, important);
         return;