Title: [169865] tags/Safari-538.39.41/Source/WebCore
Diff
Modified: tags/Safari-538.39.41/Source/WebCore/ChangeLog (169864 => 169865)
--- tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-12 00:25:01 UTC (rev 169864)
+++ tags/Safari-538.39.41/Source/WebCore/ChangeLog 2014-06-12 00:30:18 UTC (rev 169865)
@@ -1,5 +1,16 @@
2014-06-11 Dana Burkart <[email protected]>
+ Merge r169855.
+
+ 2014-06-11 Andy Estes <[email protected]>
+
+ Fix the Mac build.
+
+ * WebCore.exp.in: Exported __ZN7WebCore19ResourceRequestBase15setHTTPReferrerERKN3WTF6StringE
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: Moved ivar declarations to @interface to account for the 32-bit legacy runtime.
+
+2014-06-11 Dana Burkart <[email protected]>
+
Merge r169843.
2014-06-11 Jer Noble <[email protected]>
Modified: tags/Safari-538.39.41/Source/WebCore/WebCore.exp.in (169864 => 169865)
--- tags/Safari-538.39.41/Source/WebCore/WebCore.exp.in 2014-06-12 00:25:01 UTC (rev 169864)
+++ tags/Safari-538.39.41/Source/WebCore/WebCore.exp.in 2014-06-12 00:30:18 UTC (rev 169865)
@@ -810,6 +810,7 @@
__ZN7WebCore19MediaSessionManager9addClientEPNS_25MediaSessionManagerClientE
__ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
__ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
+__ZN7WebCore19ResourceRequestBase15setHTTPReferrerERKN3WTF6StringE
__ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldEPKcRKN3WTF6StringE
__ZN7WebCore19ResourceRequestBase19addHTTPHeaderFieldsERKNS_13HTTPHeaderMapE
__ZN7WebCore19ResourceRequestBase22defaultTimeoutIntervalEv
Modified: tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (169864 => 169865)
--- tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-12 00:25:01 UTC (rev 169864)
+++ tags/Safari-538.39.41/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-06-12 00:30:18 UTC (rev 169865)
@@ -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
