Changeset 229190 in webkit

Timestamp:

Mar 2, 2018 2:55:12 PM (6 years ago)

Author:

timothy_horton@apple.com

Message:

Fix the build after r229185 and r229184

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::exernalDeviceDisplayNameForPlayer):

• platform/ios/DeviceOrientationClientIOS.h:
• platform/ios/DeviceOrientationClientIOS.mm:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)
• platform/ios/DeviceOrientationClientIOS.h (modified) (2 diffs)
• platform/ios/DeviceOrientationClientIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-02  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build after r229185 and r229184
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::exernalDeviceDisplayNameForPlayer):
+        * platform/ios/DeviceOrientationClientIOS.h:
+        * platform/ios/DeviceOrientationClientIOS.mm:
+
 2018-03-02  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -2886 +2886 @@
     return displayName;
 #else
+    UNUSED_PARAM(player);
     return nil;
 #endif

trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h

@@ -26 +26 @@
 #pragma once
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 #include "DeviceOrientationClient.h"
@@ -58 +58 @@
 } // namespace WebCore
 
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)

trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.mm

@@ -30 +30 @@
 #import "WebCoreMotionManager.h"
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 namespace WebCore {
@@ -99 +99 @@
 } // namespace WebCore
 
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)