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

Log Message

Make the !ENABLE(DEVICE_ORIENTATION) iOS build succeed
https://bugs.webkit.org/show_bug.cgi?id=183296

Reviewed by Dan Bernstein.

* platform/ios/DeviceMotionClientIOS.h:
* platform/ios/DeviceMotionClientIOS.mm:
* platform/ios/WebCoreMotionManager.h:
* platform/ios/WebCoreMotionManager.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (229184 => 229185)


--- trunk/Source/WebCore/ChangeLog	2018-03-02 19:47:17 UTC (rev 229184)
+++ trunk/Source/WebCore/ChangeLog	2018-03-02 19:55:09 UTC (rev 229185)
@@ -1,5 +1,17 @@
 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
+
+        Reviewed by Dan Bernstein.
+
+        * platform/ios/DeviceMotionClientIOS.h:
+        * platform/ios/DeviceMotionClientIOS.mm:
+        * platform/ios/WebCoreMotionManager.h:
+        * platform/ios/WebCoreMotionManager.mm:
+
+2018-03-02  Tim Horton  <timothy_hor...@apple.com>
+
         Make it possible to build for iOS without Celestial
         https://bugs.webkit.org/show_bug.cgi?id=183295
         <rdar://problem/38074468>

Modified: trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h (229184 => 229185)


--- trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h	2018-03-02 19:47:17 UTC (rev 229184)
+++ trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h	2018-03-02 19:55:09 UTC (rev 229185)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 #include "DeviceMotionClient.h"
 #include "DeviceMotionController.h"
@@ -57,4 +57,4 @@
 
 } // namespace WebCore
 
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)

Modified: trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.mm (229184 => 229185)


--- trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.mm	2018-03-02 19:47:17 UTC (rev 229184)
+++ trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.mm	2018-03-02 19:55:09 UTC (rev 229185)
@@ -29,7 +29,7 @@
 
 #import "WebCoreMotionManager.h"
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 namespace WebCore {
 
@@ -113,4 +113,4 @@
 
 } // namespace WebCore
 
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)

Modified: trunk/Source/WebCore/platform/ios/WebCoreMotionManager.h (229184 => 229185)


--- trunk/Source/WebCore/platform/ios/WebCoreMotionManager.h	2018-03-02 19:47:17 UTC (rev 229184)
+++ trunk/Source/WebCore/platform/ios/WebCoreMotionManager.h	2018-03-02 19:55:09 UTC (rev 229185)
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef WebCoreMotionManager_h
-#define WebCoreMotionManager_h
+#pragma once
 
 #import "DeviceMotionClientIOS.h"
 #import "DeviceOrientationClientIOS.h"
@@ -31,7 +30,7 @@
 #import <CoreLocation/CoreLocation.h>
 #import <wtf/HashCountedSet.h>
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 #import <CoreMotion/CoreMotion.h>
 
@@ -57,6 +56,4 @@
 - (BOOL)headingAvailable;
 @end
 
-#endif
-
-#endif // WebCoreMotionManager_h
+#endif // PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)

Modified: trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm (229184 => 229185)


--- trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm	2018-03-02 19:47:17 UTC (rev 229184)
+++ trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm	2018-03-02 19:55:09 UTC (rev 229185)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "WebCoreMotionManager.h"
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && ENABLE(DEVICE_ORIENTATION)
 
 #import "WebCoreObjCExtras.h"
 #import "WebCoreThreadRun.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to