Changeset 201821 in webkit

Timestamp:

Jun 8, 2016 12:17:52 PM (8 years ago)

Author:

aakash_jain@apple.com

Message:

tests fail if display sleeps while run-webkit-tests is running
​https://bugs.webkit.org/show_bug.cgi?id=153919

Reviewed by Alexey Proskuryakov.

• DumpRenderTree/mac/LayoutTestHelper.m:

(releaseSleepAssertions): Release both Display sleep and System sleep assertions.
(addSleepAssertions): Add sleep assertion for both Display sleep and System sleep.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/LayoutTestHelper.m (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-06-08  Aakash Jain  <aakash_jain@apple.com>
+
+        tests fail if display sleeps while run-webkit-tests is running
+        https://bugs.webkit.org/show_bug.cgi?id=153919
+
+        Reviewed by Alexey Proskuryakov.
+
+        * DumpRenderTree/mac/LayoutTestHelper.m:
+        (releaseSleepAssertions): Release both Display sleep and System sleep assertions.
+        (addSleepAssertions): Add sleep assertion for both Display sleep and System sleep.
+
 2016-06-08  Lucas Forschler  <lforschler@apple.com>
 

trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m

@@ -48 +48 @@
 
 static int installColorProfile = false;
-static uint32_t assertionID = 0;
+static uint32_t assertionIDForDisplaySleep = 0;
+static uint32_t assertionIDForSystemSleep = 0;
 
 static NSMutableDictionary *originalColorProfileURLs()
@@ -196 +197 @@
 }
 
-static void releaseDisplaySleepAssertion()
-{
-    IOPMAssertionRelease(assertionID);
+static void releaseSleepAssertions()
+{
+    IOPMAssertionRelease(assertionIDForDisplaySleep);
+    IOPMAssertionRelease(assertionIDForSystemSleep);
 }
 
@@ -205 +207 @@
     // Try to restore the color profile and try to go down cleanly
     restoreUserColorProfile();
-    releaseDisplaySleepAssertion();
+    releaseSleepAssertions();
     exit(128 + sig);
 }
@@ -241 +243 @@
 }
 
-void addDisplaySleepAssertion() 
+void addSleepAssertions()
 {
     CFStringRef assertionName = CFSTR("WebKit LayoutTestHelper");
     CFStringRef assertionDetails = CFSTR("WebKit layout-test helper tool is preventing sleep.");
+    IOPMAssertionCreateWithDescription(kIOPMAssertionTypePreventUserIdleDisplaySleep,
+        assertionName, assertionDetails, assertionDetails, NULL, 0, NULL, &assertionIDForDisplaySleep);
     IOPMAssertionCreateWithDescription(kIOPMAssertionTypePreventUserIdleSystemSleep,
-        assertionName, assertionDetails, assertionDetails, NULL, 0, NULL, &assertionID);
+        assertionName, assertionDetails, assertionDetails, NULL, 0, NULL, &assertionIDForSystemSleep);
 }
 
@@ -270 +274 @@
     signal(SIGTERM, simpleSignalHandler);
 
-    addDisplaySleepAssertion();
+    addSleepAssertions();
     lockDownDiscreteGraphics();
 
@@ -285 +289 @@
     // Restore the profile
     restoreUserColorProfile();
-    releaseDisplaySleepAssertion();
+    releaseSleepAssertions();
 
     return 0;