Title: [179615] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 179615
- Author
- [email protected]
- Date
- 2015-02-04 10:30:40 -0800 (Wed, 04 Feb 2015)
Log Message
Merged r172257. rdar://problem/19651179
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179614 => 179615)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-04 18:20:30 UTC (rev 179614)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-04 18:30:40 UTC (rev 179615)
@@ -1,3 +1,20 @@
+2015-02-04 Babak Shafiei <[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.
+
2015-01-28 David Kilzer <[email protected]>
run-webkit-tests: Merge 46 commits from trunk to make it work
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ISOVTTCue.cpp (179614 => 179615)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ISOVTTCue.cpp 2015-02-04 18:20:30 UTC (rev 179614)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ISOVTTCue.cpp 2015-02-04 18:30:40 UTC (rev 179615)
@@ -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
