Title: [164530] trunk/Source/WebCore
- Revision
- 164530
- Author
- [email protected]
- Date
- 2014-02-21 22:56:55 -0800 (Fri, 21 Feb 2014)
Log Message
Unreviewed Mac build fix after r164529.
Replace the string-to-array algorithm with a archictecture-independant
one.
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
(WebCore::CDMSessionMediaSourceAVFObjC::generateKeyRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164529 => 164530)
--- trunk/Source/WebCore/ChangeLog 2014-02-22 06:17:53 UTC (rev 164529)
+++ trunk/Source/WebCore/ChangeLog 2014-02-22 06:56:55 UTC (rev 164530)
@@ -1,5 +1,15 @@
2014-02-21 Jer Noble <[email protected]>
+ Unreviewed Mac build fix after r164529.
+
+ Replace the string-to-array algorithm with a archictecture-independant
+ one.
+
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+ (WebCore::CDMSessionMediaSourceAVFObjC::generateKeyRequest):
+
+2014-02-21 Jer Noble <[email protected]>
+
[EME] Add a CDMSession for MediaPlayerPrivateMediaSourceAVFObjC
https://bugs.webkit.org/show_bug.cgi?id=129166
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (164529 => 164530)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2014-02-22 06:17:53 UTC (rev 164529)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2014-02-22 06:56:55 UTC (rev 164530)
@@ -71,8 +71,13 @@
systemCode = 0;
m_initData = initData;
+
String certificateString(ASCIILiteral("certificate"));
- return Uint8Array::create((uint8_t*)certificateString.getCharactersWithUpconvert<UChar>(), certificateString.length() * sizeof(UChar));
+ RefPtr<ArrayBuffer> buffer = ArrayBuffer::create(certificateString.length(), 2);
+ RefPtr<JSC::Uint16Array> array = JSC::Uint16Array::create(buffer, 0, buffer->byteLength());
+ for (unsigned i = 0, length = certificateString.length(); i < length; ++i)
+ array->set(i, certificateString[i]);
+ return Uint8Array::create(buffer, 0, buffer->byteLength());
}
void CDMSessionMediaSourceAVFObjC::releaseKeys()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
