Title: [229190] trunk/Source/WebCore
Revision
229190
Author
timothy_hor...@apple.com
Date
2018-03-02 14:55:12 -0800 (Fri, 02 Mar 2018)

Log Message

Fix the build after r229185 and r229184

* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::exernalDeviceDisplayNameForPlayer):
* platform/ios/DeviceOrientationClientIOS.h:
* platform/ios/DeviceOrientationClientIOS.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (229189 => 229190)


--- trunk/Source/WebCore/ChangeLog	2018-03-02 22:13:12 UTC (rev 229189)
+++ trunk/Source/WebCore/ChangeLog	2018-03-02 22:55:12 UTC (rev 229190)
@@ -1,5 +1,14 @@
 2018-03-02  Tim Horton  <timothy_hor...@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_hor...@apple.com>
+
         Make the !ENABLE(DEVICE_ORIENTATION) iOS build succeed
         https://bugs.webkit.org/show_bug.cgi?id=183296
 

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (229189 => 229190)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2018-03-02 22:13:12 UTC (rev 229189)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2018-03-02 22:55:12 UTC (rev 229190)
@@ -2885,6 +2885,7 @@
 
     return displayName;
 #else
+    UNUSED_PARAM(player);
     return nil;
 #endif
 }

Modified: trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h (229189 => 229190)


--- trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h	2018-03-02 22:13:12 UTC (rev 229189)
+++ trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h	2018-03-02 22:55:12 UTC (rev 229190)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 #include "DeviceOrientationClient.h"
 #include "DeviceOrientationController.h"
@@ -57,4 +57,4 @@
 
 } // namespace WebCore
 
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)

Modified: trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.mm (229189 => 229190)


--- trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.mm	2018-03-02 22:13:12 UTC (rev 229189)
+++ trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.mm	2018-03-02 22:55:12 UTC (rev 229190)
@@ -29,7 +29,7 @@
 
 #import "WebCoreMotionManager.h"
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 namespace WebCore {
 
@@ -98,4 +98,4 @@
 
 } // namespace WebCore
 
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to