Title: [182255] trunk/Source/WebCore
- Revision
- 182255
- Author
- eric.carl...@apple.com
- Date
- 2015-04-01 14:26:30 -0700 (Wed, 01 Apr 2015)
Log Message
Another attempt to fixi the iOS build after r182240.
Reviewed by Dean Jackson.
* platform/graphics/MediaPlaybackTarget.h:
(WebCore::MediaPlaybackTarget::hasActiveRoute):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182254 => 182255)
--- trunk/Source/WebCore/ChangeLog 2015-04-01 21:01:24 UTC (rev 182254)
+++ trunk/Source/WebCore/ChangeLog 2015-04-01 21:26:30 UTC (rev 182255)
@@ -1,5 +1,14 @@
2015-04-01 Eric Carlson <eric.carl...@apple.com>
+ Another attempt to fixi the iOS build after r182240.
+
+ Reviewed by Dean Jackson.
+
+ * platform/graphics/MediaPlaybackTarget.h:
+ (WebCore::MediaPlaybackTarget::hasActiveRoute):
+
+2015-04-01 Eric Carlson <eric.carl...@apple.com>
+
Fix the iOS build after r182240.
* platform/graphics/MediaPlaybackTarget.h:
Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h (182254 => 182255)
--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-01 21:01:24 UTC (rev 182254)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-01 21:26:30 UTC (rev 182255)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
