Modified: trunk/Source/WebCore/ChangeLog (137749 => 137750)
--- trunk/Source/WebCore/ChangeLog 2012-12-14 17:00:16 UTC (rev 137749)
+++ trunk/Source/WebCore/ChangeLog 2012-12-14 17:19:36 UTC (rev 137750)
@@ -1,3 +1,22 @@
+2012-12-14 Jessie Berlin <jber...@apple.com>
+
+ Mac build fix after r137724.
+
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerKeyAdded):
+ Comment out the names of the unused parameters so they don't trigger unused parameter
+ warnings.
+ (WebCore::MediaPlayerClient::mediaPlayerKeyError):
+ Ditto.
+ (WebCore::MediaPlayerClient::mediaPlayerKeyMessage):
+ Ditto.
+ (WebCore::MediaPlayerClient::mediaPlayerKeyNeeded):
+ Ditto.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::generateKeyRequest):
+ Pass an empty URL for the new defaultURL parameter in the keyMessage call.
+
2012-12-14 Alberto Garcia <agar...@igalia.com>
[GTK] When in private mode WebKitGTK+ should not save HTTP authentication credentials to the persistent storage
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (137749 => 137750)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-12-14 17:00:16 UTC (rev 137749)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-12-14 17:19:36 UTC (rev 137750)
@@ -186,10 +186,10 @@
#if ENABLE(ENCRYPTED_MEDIA)
enum MediaKeyErrorCode { UnknownError = 1, ClientError, ServiceError, OutputError, HardwareChangeError, DomainError };
- virtual void mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, const String& sessionId) { }
- virtual void mediaPlayerKeyError(MediaPlayer*, const String& keySystem, const String& sessionId, MediaKeyErrorCode, unsigned short systemCode) { }
- virtual void mediaPlayerKeyMessage(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength, const KURL& defaultURL) { }
- virtual bool mediaPlayerKeyNeeded(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength) { return false; }
+ virtual void mediaPlayerKeyAdded(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */) { }
+ virtual void mediaPlayerKeyError(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) { }
+ virtual void mediaPlayerKeyMessage(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLength */, const KURL& /* defaultURL */) { }
+ virtual bool mediaPlayerKeyNeeded(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */, const unsigned char* /* initData */, unsigned /* initDataLength */) { return false; }
#endif
virtual String mediaPlayerReferrer() const { return String(); }
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (137749 => 137750)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2012-12-14 17:00:16 UTC (rev 137749)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2012-12-14 17:19:36 UTC (rev 137750)
@@ -1148,7 +1148,7 @@
RefPtr<ArrayBuffer> keyRequestBuffer = ArrayBuffer::create([keyRequest.get() bytes], [keyRequest.get() length]);
RefPtr<Uint8Array> keyRequestArray = Uint8Array::create(keyRequestBuffer, 0, keyRequestBuffer->byteLength());
- player()->keyMessage(keySystem, sessionID, keyRequestArray->data(), keyRequestArray->byteLength());
+ player()->keyMessage(keySystem, sessionID, keyRequestArray->data(), keyRequestArray->byteLength(), KURL());
// Move ownership of the AVAssetResourceLoadingRequestfrom the keyIDToRequestMap to the sessionIDToRequestMap:
m_sessionIDToRequestMap.set(sessionID, avRequest);
