Title: [182257] tags/Safari-601.1.25/Source/WebCore
- Revision
- 182257
- Author
- [email protected]
- Date
- 2015-04-01 15:37:15 -0700 (Wed, 01 Apr 2015)
Log Message
Merged r182255. rdar://problem/19130597
Modified Paths
Diff
Modified: tags/Safari-601.1.25/Source/WebCore/ChangeLog (182256 => 182257)
--- tags/Safari-601.1.25/Source/WebCore/ChangeLog 2015-04-01 22:13:05 UTC (rev 182256)
+++ tags/Safari-601.1.25/Source/WebCore/ChangeLog 2015-04-01 22:37:15 UTC (rev 182257)
@@ -1,5 +1,18 @@
2015-04-01 Babak Shafiei <[email protected]>
+ Merge r182255.
+
+ 2015-04-01 Eric Carlson <[email protected]>
+
+ Another attempt to fixi the iOS build after r182240.
+
+ Reviewed by Dean Jackson.
+
+ * platform/graphics/MediaPlaybackTarget.h:
+ (WebCore::MediaPlaybackTarget::hasActiveRoute):
+
+2015-04-01 Babak Shafiei <[email protected]>
+
Merge r182250.
2015-04-01 Eric Carlson <[email protected]>
Modified: tags/Safari-601.1.25/Source/WebCore/platform/graphics/MediaPlaybackTarget.h (182256 => 182257)
--- tags/Safari-601.1.25/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-01 22:13:05 UTC (rev 182256)
+++ tags/Safari-601.1.25/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-01 22:37:15 UTC (rev 182257)
@@ -30,9 +30,11 @@
#include <wtf/RetainPtr.h>
+#if PLATFORM(COCOA)
OBJC_CLASS NSKeyedArchiver;
OBJC_CLASS NSKeyedUnarchiver;
OBJC_CLASS AVOutputContext;
+#endif
namespace WebCore {
@@ -40,7 +42,7 @@
public:
virtual ~MediaPlaybackTarget() { }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
WEBCORE_EXPORT MediaPlaybackTarget(AVOutputContext *context = nil) { m_devicePickerContext = context; }
WEBCORE_EXPORT void encode(NSKeyedArchiver *) const;
@@ -48,7 +50,13 @@
void setDevicePickerContext(AVOutputContext *context) { m_devicePickerContext = context; }
AVOutputContext *devicePickerContext() const { return m_devicePickerContext.get(); }
+
+#if PLATFORM(IOS)
+ bool hasActiveRoute() const { return false; }
+#else
bool hasActiveRoute() const;
+#endif
+
#else
void setDevicePickerContext(AVOutputContext *) { }
AVOutputContext *devicePickerContext() const { return nullptr; }
@@ -56,7 +64,7 @@
#endif
protected:
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
RetainPtr<AVOutputContext> m_devicePickerContext;
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
