Title: [172283] branches/safari-600.1-branch/Source/WebCore
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172282 => 172283)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 22:08:19 UTC (rev 172282)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 22:10:05 UTC (rev 172283)
@@ -1,5 +1,22 @@
2014-08-07 Dana Burkart <[email protected]>
+ Merge r172257
+
+ 2014-08-07 Eric Carlson <[email protected]>
+
+ Create UTF-8 string from in-band VTT cues
+ https://bugs.webkit.org/show_bug.cgi?id=135716
+
+ Reviewed by Brent Fulgham.
+
+ Tests will be added in https://bugs.webkit.org/show_bug.cgi?id=135717.
+
+ * platform/graphics/ISOVTTCue.cpp:
+ (WebCore::ISOBox::peekString): Call String::fromUTF8 because we know that VTT is always
+ UTF-8.
+
+2014-08-07 Dana Burkart <[email protected]>
+
Merge r172244
2014-08-06 Jeremy Jones <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/ISOVTTCue.cpp (172282 => 172283)
--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/ISOVTTCue.cpp 2014-08-07 22:08:19 UTC (rev 172282)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/ISOVTTCue.cpp 2014-08-07 22:10:05 UTC (rev 172283)
@@ -75,7 +75,7 @@
if (data->byteLength() < offset + length)
return emptyString();
- return String(JSC::Uint8Array::create(data, offset, length)->data(), length);
+ return String::fromUTF8(JSC::Uint8Array::create(data, offset, length)->data(), length);
}
static const AtomicString& vttCueBoxType()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
