Title: [169875] tags/Safari-538.39.41/Source/WebCore
- Revision
- 169875
- Author
- bshaf...@apple.com
- Date
- 2014-06-11 20:12:47 -0700 (Wed, 11 Jun 2014)
Log Message
Re-merged r169843. <rdar://problem/16746383>
Modified Paths
Diff
Modified: tags/Safari-538.39.41/Source/WebCore/ChangeLog (169874 => 169875)
--- tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-12 03:09:29 UTC (rev 169874)
+++ tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-12 03:12:47 UTC (rev 169875)
@@ -1,5 +1,16 @@
2014-06-11 Babak Shafiei <bshaf...@apple.com>
+ Merge r169843. <rdar://problem/16746383>
+
+ 2014-06-11 Jer Noble <jer.no...@apple.com>
+
+ 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 Babak Shafiei <bshaf...@apple.com>
+
Merge r169830. <rdar://problem/16746383>
2014-06-11 Jer Noble <jer.no...@apple.com>
Modified: tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (169874 => 169875)
--- tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-12 03:09:29 UTC (rev 169874)
+++ tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-12 03:12:47 UTC (rev 169875)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
