Enable ProcessAssertions on iOS Simulator
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 9 Mar 2019 00:59:40 +0000 (00:59 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 9 Mar 2019 00:59:40 +0000 (00:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=195479

Reviewed by Alexey Proskuryakov.

Enable ProcessAssertions on iOS Simulator. We have some layout tests timing out in the
iOS Simulator due to the WebContent process suspending. Turning on ProcessAssertions in
the iOS Simulator seems to make those tests pass.

* UIProcess/ProcessAssertion.cpp:
* UIProcess/ProcessAssertion.h:
* UIProcess/ios/ProcessAssertionIOS.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242666 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ProcessAssertion.cpp
Source/WebKit/UIProcess/ProcessAssertion.h
Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm

index 9272563..8aac502 100644 (file)
@@ -1,5 +1,20 @@
 2019-03-08  Chris Dumez  <cdumez@apple.com>
 
 2019-03-08  Chris Dumez  <cdumez@apple.com>
 
+        Enable ProcessAssertions on iOS Simulator
+        https://bugs.webkit.org/show_bug.cgi?id=195479
+
+        Reviewed by Alexey Proskuryakov.
+
+        Enable ProcessAssertions on iOS Simulator. We have some layout tests timing out in the
+        iOS Simulator due to the WebContent process suspending. Turning on ProcessAssertions in
+        the iOS Simulator seems to make those tests pass.
+
+        * UIProcess/ProcessAssertion.cpp:
+        * UIProcess/ProcessAssertion.h:
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+
+2019-03-08  Chris Dumez  <cdumez@apple.com>
+
         Add support for Device Orientation / Motion permission API
         https://bugs.webkit.org/show_bug.cgi?id=195329
         <rdar://problem/47645367>
         Add support for Device Orientation / Motion permission API
         https://bugs.webkit.org/show_bug.cgi?id=195329
         <rdar://problem/47645367>
index 9adbd35..e325d10 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "ProcessAssertion.h"
 
 #include "config.h"
 #include "ProcessAssertion.h"
 
-#if !PLATFORM(IOS_FAMILY) || PLATFORM(IOS_FAMILY_SIMULATOR)
+#if !PLATFORM(IOS_FAMILY)
 
 namespace WebKit {
 
 
 namespace WebKit {
 
@@ -44,4 +44,4 @@ void ProcessAssertion::setState(AssertionState assertionState)
 
 } // namespace WebKit
 
 
 } // namespace WebKit
 
-#endif // !PLATFORM(IOS_FAMILY) || PLATFORM(IOS_FAMILY_SIMULATOR)
+#endif // !PLATFORM(IOS_FAMILY)
index 210d40a..47cc80f 100644 (file)
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #endif
 
 #include <unistd.h>
 #endif
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS BKSProcessAssertion;
 #endif
 #include <wtf/RetainPtr.h>
 OBJC_CLASS BKSProcessAssertion;
 #endif
@@ -66,7 +66,7 @@ public:
     AssertionState state() const { return m_assertionState; }
     virtual void setState(AssertionState);
 
     AssertionState state() const { return m_assertionState; }
     virtual void setState(AssertionState);
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 protected:
     enum class Validity { No, Yes, Unset };
     Validity validity() const { return m_validity; }
 protected:
     enum class Validity { No, Yes, Unset };
     Validity validity() const { return m_validity; }
@@ -75,7 +75,7 @@ protected:
 #endif
 
 private:
 #endif
 
 private:
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
     RetainPtr<BKSProcessAssertion> m_assertion;
     Validity m_validity { Validity::Unset };
 #endif
     RetainPtr<BKSProcessAssertion> m_assertion;
     Validity m_validity { Validity::Unset };
 #endif
@@ -83,7 +83,7 @@ private:
     Client* m_client { nullptr };
 };
 
     Client* m_client { nullptr };
 };
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 
 class ProcessAndUIAssertion final : public ProcessAssertion {
 public:
 
 class ProcessAndUIAssertion final : public ProcessAssertion {
 public:
@@ -104,6 +104,6 @@ private:
 
 using ProcessAndUIAssertion = ProcessAssertion;
 
 
 using ProcessAndUIAssertion = ProcessAssertion;
 
-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#endif // PLATFORM(IOS_FAMILY)
     
 } // namespace WebKit
     
 } // namespace WebKit
index 5c32183..5b56f59 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "ProcessAssertion.h"
 
 #import "config.h"
 #import "ProcessAssertion.h"
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 
 #import "AssertionServicesSPI.h"
 #import "Logging.h"
 
 #import "AssertionServicesSPI.h"
 #import "Logging.h"
@@ -256,4 +256,4 @@ void ProcessAndUIAssertion::processAssertionWasInvalidated()
 
 } // namespace WebKit
 
 
 } // namespace WebKit
 
-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#endif // PLATFORM(IOS_FAMILY)