Changeset 182255 in webkit

Timestamp:

Apr 1, 2015, 2:26:30 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

Another attempt to fixi the iOS build after r182240.

Reviewed by Dean Jackson.

• platform/graphics/MediaPlaybackTarget.h:

(WebCore::MediaPlaybackTarget::hasActiveRoute):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/MediaPlaybackTarget.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-01  Eric Carlson  <eric.carlson@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.carlson@apple.com>
 

trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h

@@ -31 +31 @@
 #include <wtf/RetainPtr.h>
 
+#if PLATFORM(COCOA)
 OBJC_CLASS NSKeyedArchiver;
 OBJC_CLASS NSKeyedUnarchiver;
 OBJC_CLASS AVOutputContext;
+#endif
 
 namespace WebCore {
@@ -41 +43 @@
     virtual ~MediaPlaybackTarget() { }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     WEBCORE_EXPORT MediaPlaybackTarget(AVOutputContext *context = nil) { m_devicePickerContext = context; }
 
@@ -49 +51 @@
     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 *) { }
@@ -57 +65 @@
 
 protected:
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<AVOutputContext> m_devicePickerContext;
 #endif