Changeset 258587 in webkit

Timestamp:

Mar 17, 2020, 1:52:00 PM (5 years ago)

Author:

eric.carlson@apple.com

Message:

TextTrackBase should validate language before setting m_validBCP47Language
​https://bugs.webkit.org/show_bug.cgi?id=209094
<rdar://problem/60439603>

Reviewed by Jer Noble.
Source/WebCore:

Test: media/track/track-bcp-language.html

• html/track/TextTrack.idl:
• html/track/TrackBase.cpp:

(WebCore::TrackBase::TrackBase): Don't set m_validBCP47Language unless the language is valid.
(WebCore::TrackBase::setLanguage): Clear m_validBCP47Language if the language is invalid.
Restructure the code to use early returns.
(WebCore::TrackBase::validBCP47Language const): Deleted.

• html/track/TrackBase.h:

(WebCore::TrackBase::validBCP47Language const):

• testing/Internals.cpp:

(WebCore::Internals::textTrackBCP47Language):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• media/track/track-bcp-language-expected.txt: Added.
• media/track/track-bcp-language.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-bcp-language-expected.txt (added)
• LayoutTests/media/track/track-bcp-language.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/track/TextTrack.idl (modified) (1 diff)
• Source/WebCore/html/track/TrackBase.cpp (modified) (3 diffs)
• Source/WebCore/html/track/TrackBase.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-17  Eric Carlson  <eric.carlson@apple.com>
+
+        TextTrackBase should validate language before setting m_validBCP47Language
+        https://bugs.webkit.org/show_bug.cgi?id=209094
+        <rdar://problem/60439603>
+
+        Reviewed by Jer Noble.
+
+        * media/track/track-bcp-language-expected.txt: Added.
+        * media/track/track-bcp-language.html: Added.
+
 2020-03-17  Jacob Uphoff  <jacob_uphoff@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-17  Eric Carlson  <eric.carlson@apple.com>
+
+        TextTrackBase should validate language before setting m_validBCP47Language
+        https://bugs.webkit.org/show_bug.cgi?id=209094
+        <rdar://problem/60439603>
+
+        Reviewed by Jer Noble.
+        
+        Test: media/track/track-bcp-language.html
+
+        * html/track/TextTrack.idl:
+        * html/track/TrackBase.cpp:
+        (WebCore::TrackBase::TrackBase): Don't set m_validBCP47Language unless the language is valid.
+        (WebCore::TrackBase::setLanguage): Clear m_validBCP47Language if the language is invalid. 
+        Restructure the code to use early returns.
+        (WebCore::TrackBase::validBCP47Language const): Deleted.
+        * html/track/TrackBase.h:
+        (WebCore::TrackBase::validBCP47Language const):
+        * testing/Internals.cpp:
+        (WebCore::Internals::textTrackBCP47Language):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-03-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/html/track/TextTrack.idl

@@ -29 +29 @@
 [
     Conditional=VIDEO_TRACK,
+    ExportToWrappedFunction,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction,

trunk/Source/WebCore/html/track/TrackBase.cpp

@@ -39 +39 @@
 static int s_uniqueId = 0;
 
+static bool isValidBCP47LanguageTag(const String&);
+
 #if !RELEASE_LOG_DISABLED
 static RefPtr<Logger>& nullLogger()
@@ -52 +54 @@
     , m_label(label)
     , m_language(language)
-    , m_validBCP47Language(language)
 {
     ASSERT(type != BaseTrack);
+    if (isValidBCP47LanguageTag(language))
+        m_validBCP47Language = language;
+
     m_type = type;
 
@@ -130 +134 @@
 void TrackBase::setLanguage(const AtomString& language)
 {
-    if (!language.isEmpty() && !isValidBCP47LanguageTag(language)) {
-        String message;
-        if (language.contains((UChar)'\0'))
-            message = "The language contains a null character and is not a valid BCP 47 language tag."_s;
-        else {
-            StringBuilder stringBuilder;
-            stringBuilder.appendLiteral("The language '");
-            stringBuilder.append(language);
-            stringBuilder.appendLiteral("' is not a valid BCP 47 language tag.");
-            message = stringBuilder.toString();
-        }
-        if (auto element = this->element())
-            element->document().addConsoleMessage(MessageSource::Rendering, MessageLevel::Warning, message);
-    } else
+    m_language = language;
+    if (language.isEmpty() || isValidBCP47LanguageTag(language)) {
         m_validBCP47Language = language;
-    
-    m_language = language;
-}
+        return;
+    }
 
-AtomString TrackBase::validBCP47Language() const
-{
-    return m_validBCP47Language;
+    m_validBCP47Language = emptyAtom();
+
+    auto element = this->element();
+    if (!element)
+        return;
+
+    String message;
+    if (language.contains((UChar)'\0'))
+        message = "The language contains a null character and is not a valid BCP 47 language tag."_s;
+    else {
+        StringBuilder stringBuilder;
+        stringBuilder.appendLiteral("The language '");
+        stringBuilder.append(language);
+        stringBuilder.appendLiteral("' is not a valid BCP 47 language tag.");
+        message = stringBuilder.toString();
+    }
+
+    element->document().addConsoleMessage(MessageSource::Rendering, MessageLevel::Warning, message);
 }
 

trunk/Source/WebCore/html/track/TrackBase.h

@@ -60 +60 @@
     void setLabel(const AtomString& label) { m_label = label; }
 
-    AtomString validBCP47Language() const;
+    AtomString validBCP47Language() const { return m_validBCP47Language; }
     AtomString language() const { return m_language; }
     virtual void setLanguage(const AtomString&);

trunk/Source/WebCore/testing/Internals.cpp

@@ -238 +238 @@
 #include "CaptionUserPreferences.h"
 #include "PageGroup.h"
+#include "TextTrack.h"
 #include "TextTrackCueGeneric.h"
 #endif
@@ -3770 +3771 @@
     return TextTrackCueGeneric::create(*document, MediaTime::createWithDouble(startTime), MediaTime::createWithDouble(endTime), text);
 }
+
+ExceptionOr<String> Internals::textTrackBCP47Language(TextTrack& track)
+{
+    return String { track.validBCP47Language() };
+}
 #endif
 

trunk/Source/WebCore/testing/Internals.h

@@ -99 +99 @@
 class StringCallback;
 class StyleSheet;
+class TextTrack;
 class TimeRanges;
 class TypeConversions;
@@ -595 +596 @@
 #if ENABLE(VIDEO_TRACK)
     RefPtr<TextTrackCueGeneric> createGenericCue(double startTime, double endTime, String text);
+    ExceptionOr<String> textTrackBCP47Language(TextTrack&);
 #endif
 

trunk/Source/WebCore/testing/Internals.idl

@@ -588 +588 @@
     [Conditional=VIDEO_TRACK, MayThrowException] void setCaptionDisplayMode(DOMString mode);
     [Conditional=VIDEO_TRACK] TextTrackCueGeneric createGenericCue(double startTime, double endTime, DOMString text);
+    [Conditional=VIDEO_TRACK, MayThrowException] DOMString textTrackBCP47Language(TextTrack track);
 
     [Conditional=VIDEO] TimeRanges createTimeRanges(Float32Array startTimes, Float32Array