Changeset 242666 in webkit

Timestamp:

Mar 8, 2019, 4:59:40 PM (7 years ago)

Author:

Chris Dumez

Message:

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ProcessAssertion.cpp (modified) (2 diffs)
• UIProcess/ProcessAssertion.h (modified) (5 diffs)
• UIProcess/ios/ProcessAssertionIOS.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/UIProcess/ProcessAssertion.cpp

@@ -27 +27 @@
 #include "ProcessAssertion.h"
 
-#if !PLATFORM(IOS_FAMILY) || PLATFORM(IOS_FAMILY_SIMULATOR)
+#if !PLATFORM(IOS_FAMILY)
 
 namespace WebKit {
@@ -45 +45 @@
 } // namespace WebKit
 
-#endif // !PLATFORM(IOS_FAMILY) || PLATFORM(IOS_FAMILY_SIMULATOR)
+#endif // !PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/UIProcess/ProcessAssertion.h

@@ -35 +35 @@
 #endif
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS BKSProcessAssertion;
@@ -67 +67 @@
     virtual void setState(AssertionState);
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 protected:
     enum class Validity { No, Yes, Unset };
@@ -76 +76 @@
 
 private:
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
     RetainPtr<BKSProcessAssertion> m_assertion;
     Validity m_validity { Validity::Unset };
@@ -84 +84 @@
 };
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 
 class ProcessAndUIAssertion final : public ProcessAssertion {
@@ -105 +105 @@
 using ProcessAndUIAssertion = ProcessAssertion;
 
-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#endif // PLATFORM(IOS_FAMILY)
     
 } // namespace WebKit

trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm

@@ -27 +27 @@
 #import "ProcessAssertion.h"
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if PLATFORM(IOS_FAMILY)
 
 #import "AssertionServicesSPI.h"
@@ -257 +257 @@
 } // namespace WebKit
 
-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
+#endif // PLATFORM(IOS_FAMILY)