Title: [169857] tags/Safari-538.39.41/Source/WebCore
Diff
Modified: tags/Safari-538.39.41/Source/WebCore/ChangeLog (169856 => 169857)
--- tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-11 23:17:06 UTC (rev 169856)
+++ tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-11 23:42:39 UTC (rev 169857)
@@ -1,5 +1,16 @@
2014-06-11 Dana Burkart <[email protected]>
+ Merge r169843.
+
+ 2014-06-11 Jer Noble <[email protected]>
+
+ Unreviwed Mac release build fix; mark the keyPath parameter as unused.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (-[WebAVSampleBufferErrorListener observeValueForKeyPath:ofObject:change:context:]):
+
+2014-06-11 Dana Burkart <[email protected]>
+
Merge r169830.
2014-06-11 Jer Noble <[email protected]>
Modified: tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (169856 => 169857)
--- tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-11 23:17:06 UTC (rev 169856)
+++ tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-11 23:42:39 UTC (rev 169857)
@@ -373,6 +373,7 @@
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
UNUSED_PARAM(context);
+ UNUSED_PARAM(keyPath);
ASSERT(_parent);
RetainPtr<WebAVSampleBufferErrorListener> strongSelf = self;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
