Title: [182253] tags/Safari-601.1.25/Source/WebCore
- Revision
- 182253
- Author
- [email protected]
- Date
- 2015-04-01 12:58:39 -0700 (Wed, 01 Apr 2015)
Log Message
Merged r182250. rdar://problem/19130597
Modified Paths
Diff
Modified: tags/Safari-601.1.25/Source/WebCore/ChangeLog (182252 => 182253)
--- tags/Safari-601.1.25/Source/WebCore/ChangeLog 2015-04-01 19:55:50 UTC (rev 182252)
+++ tags/Safari-601.1.25/Source/WebCore/ChangeLog 2015-04-01 19:58:39 UTC (rev 182253)
@@ -1,5 +1,15 @@
2015-04-01 Babak Shafiei <[email protected]>
+ Merge r182250.
+
+ 2015-04-01 Eric Carlson <[email protected]>
+
+ Fix the iOS build after r182240.
+
+ * platform/graphics/MediaPlaybackTarget.h:
+
+2015-04-01 Babak Shafiei <[email protected]>
+
Merge r182240.
2015-04-01 Eric Carlson <[email protected]>
Modified: tags/Safari-601.1.25/Source/WebCore/platform/graphics/MediaPlaybackTarget.h (182252 => 182253)
--- tags/Safari-601.1.25/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-01 19:55:50 UTC (rev 182252)
+++ tags/Safari-601.1.25/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-01 19:58:39 UTC (rev 182253)
@@ -30,11 +30,9 @@
#include <wtf/RetainPtr.h>
-#if PLATFORM(COCOA)
OBJC_CLASS NSKeyedArchiver;
OBJC_CLASS NSKeyedUnarchiver;
OBJC_CLASS AVOutputContext;
-#endif
namespace WebCore {
@@ -42,7 +40,7 @@
public:
virtual ~MediaPlaybackTarget() { }
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
WEBCORE_EXPORT MediaPlaybackTarget(AVOutputContext *context = nil) { m_devicePickerContext = context; }
WEBCORE_EXPORT void encode(NSKeyedArchiver *) const;
@@ -58,7 +56,7 @@
#endif
protected:
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
RetainPtr<AVOutputContext> m_devicePickerContext;
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
