Title: [169876] tags/Safari-538.39.41/Source/WebCore
- Revision
- 169876
- Author
- [email protected]
- Date
- 2014-06-11 20:24:33 -0700 (Wed, 11 Jun 2014)
Log Message
Re-merged r169855. <rdar://problem/16746383>
Modified Paths
Diff
Modified: tags/Safari-538.39.41/Source/WebCore/ChangeLog (169875 => 169876)
--- tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-12 03:12:47 UTC (rev 169875)
+++ tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-12 03:24:33 UTC (rev 169876)
@@ -1,5 +1,15 @@
2014-06-11 Babak Shafiei <[email protected]>
+ Merge r169855 minus WebCore.exp.in. <rdar://problem/16746383>
+
+ 2014-06-11 Andy Estes <[email protected]>
+
+ Fix the Mac build.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: Moved ivar declarations to @interface to account for the 32-bit legacy runtime.
+
+2014-06-11 Babak Shafiei <[email protected]>
+
Merge r169843. <rdar://problem/16746383>
2014-06-11 Jer Noble <[email protected]>
Modified: tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (169875 => 169876)
--- tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-12 03:12:47 UTC (rev 169875)
+++ tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-12 03:24:33 UTC (rev 169876)
@@ -283,7 +283,12 @@
}
@end
-@interface WebAVSampleBufferErrorListener : NSObject
+@interface WebAVSampleBufferErrorListener : NSObject {
+ WebCore::SourceBufferPrivateAVFObjC* _parent;
+ Vector<RetainPtr<AVSampleBufferDisplayLayer>> _layers;
+ Vector<RetainPtr<AVSampleBufferAudioRenderer>> _renderers;
+}
+
- (id)initWithParent:(WebCore::SourceBufferPrivateAVFObjC*)parent;
- (void)invalidate;
- (void)beginObservingLayer:(AVSampleBufferDisplayLayer *)layer;
@@ -292,11 +297,7 @@
- (void)stopObservingRenderer:(AVSampleBufferAudioRenderer *)renderer;
@end
-@implementation WebAVSampleBufferErrorListener {
- WebCore::SourceBufferPrivateAVFObjC* _parent;
- Vector<RetainPtr<AVSampleBufferDisplayLayer>> _layers;
- Vector<RetainPtr<AVSampleBufferAudioRenderer>> _renderers;
-}
+@implementation WebAVSampleBufferErrorListener
- (id)initWithParent:(WebCore::SourceBufferPrivateAVFObjC*)parent
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
