Title: [151074] branches/safari-537.43-branch/Tools
Diff
Modified: branches/safari-537.43-branch/Tools/ChangeLog (151073 => 151074)
--- branches/safari-537.43-branch/Tools/ChangeLog 2013-06-01 22:24:14 UTC (rev 151073)
+++ branches/safari-537.43-branch/Tools/ChangeLog 2013-06-01 23:09:26 UTC (rev 151074)
@@ -1,3 +1,17 @@
+2013-05-28 Jessie Berlin <[email protected]>
+
+ Merge r150636
+
+ 2013-05-24 Steve Falkenburg <[email protected]>
+
+ Update prepareConsistentTestingEnvironment to use a non-deprecated API.
+ https://bugs.webkit.org/show_bug.cgi?id=116710
+
+ Reviewed by Mark Rowe.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (prepareConsistentTestingEnvironment): Use beginActivityWithOptions instead of beginSuspensionOfSystemBehaviors.
+
2013-05-28 Lucas Forschler <[email protected]>
Merge r150695
Modified: branches/safari-537.43-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (151073 => 151074)
--- branches/safari-537.43-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-01 22:24:14 UTC (rev 151073)
+++ branches/safari-537.43-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-01 23:09:26 UTC (rev 151074)
@@ -859,8 +859,8 @@
makeLargeMallocFailSilently();
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- static id assertion = [[[NSProcessInfo processInfo] beginSuspensionOfSystemBehaviors:NSSystemBehaviorCommonBehaviors
- reason:@"DumpRenderTree should not be subject to process suppression"] retain];
+ NSActivityOptions options = (NSActivityUserInitiatedAllowingIdleSystemSleep | NSActivityLatencyCritical) & ~(NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled);
+ static id assertion = [[[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"DumpRenderTree should not be subject to process suppression"] retain];
ASSERT_UNUSED(assertion, assertion);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
