Changeset 259579 in webkit

Timestamp:

Apr 6, 2020, 11:07:25 AM (6 years ago)

Author:

Chris Dumez

Message:

ProcessAssertion should use ASCIILiteral for its reason
​https://bugs.webkit.org/show_bug.cgi?id=210049

Reviewed by Alex Christensen.

ProcessAssertion should use ASCIILiteral for its reason, instead of a String.

• Shared/ios/DependencyProcessAssertionIOS.mm:

(WebKit::DependencyProcessAssertion::DependencyProcessAssertion):

• UIProcess/ProcessAssertion.cpp:

(WebKit::ProcessAssertion::ProcessAssertion):

• UIProcess/ProcessAssertion.h:
• UIProcess/ios/ProcessAssertionIOS.mm:

(WebKit::ProcessAssertion::ProcessAssertion):
(WebKit::ProcessAndUIAssertion::ProcessAndUIAssertion):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-06  Chris Dumez  <cdumez@apple.com>
+
+        ProcessAssertion should use ASCIILiteral for its reason
+        https://bugs.webkit.org/show_bug.cgi?id=210049
+
+        Reviewed by Alex Christensen.
+
+        ProcessAssertion should use ASCIILiteral for its reason, instead of a String.
+
+        * Shared/ios/DependencyProcessAssertionIOS.mm:
+        (WebKit::DependencyProcessAssertion::DependencyProcessAssertion):
+        * UIProcess/ProcessAssertion.cpp:
+        (WebKit::ProcessAssertion::ProcessAssertion):
+        * UIProcess/ProcessAssertion.h:
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+        (WebKit::ProcessAssertion::ProcessAssertion):
+        (WebKit::ProcessAndUIAssertion::ProcessAndUIAssertion):
+
 2020-04-04  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/Shared/ios/DependencyProcessAssertionIOS.mm

@@ -37 +37 @@
     RBSTarget *target = [RBSTarget targetWithPid:targetPID];
     RBSDomainAttribute *domainAttribute = [RBSDomainAttribute attributeWithDomain:@"com.apple.webkit" name:@"DependentProcessLink"];
-    m_assertion = adoptNS([[RBSAssertion alloc] initWithExplanation:String { description } target:target attributes:@[domainAttribute]]);
+
+    NSString *nsDescription = [NSString stringWithCString:description.characters() encoding:NSASCIIStringEncoding];
+    m_assertion = adoptNS([[RBSAssertion alloc] initWithExplanation:nsDescription target:target attributes:@[domainAttribute]]);
     NSError *acquisitionError = nil;
     if (![m_assertion acquireWithError:&acquisitionError])

trunk/Source/WebKit/UIProcess/ProcessAssertion.cpp

@@ -33 +33 @@
 namespace WebKit {
 
-ProcessAssertion::ProcessAssertion(ProcessID, const String&, ProcessAssertionType assertionType)
+ProcessAssertion::ProcessAssertion(ProcessID, ASCIILiteral, ProcessAssertionType assertionType)
     : m_assertionType(assertionType)
 {

trunk/Source/WebKit/UIProcess/ProcessAssertion.h

@@ -59 +59 @@
     };
 
-    ProcessAssertion(ProcessID, const String& reason, ProcessAssertionType);
+    ProcessAssertion(ProcessID, ASCIILiteral reason, ProcessAssertionType);
     virtual ~ProcessAssertion();
 
@@ -88 +88 @@
 class ProcessAndUIAssertion final : public ProcessAssertion {
 public:
-    ProcessAndUIAssertion(ProcessID, const String& reason, ProcessAssertionType);
+    ProcessAndUIAssertion(ProcessID, ASCIILiteral reason, ProcessAssertionType);
     ~ProcessAndUIAssertion();
 

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

@@ -300 +300 @@
 }
 
-ProcessAssertion::ProcessAssertion(pid_t pid, const String& name, ProcessAssertionType assertionType)
+ProcessAssertion::ProcessAssertion(pid_t pid, ASCIILiteral reason, ProcessAssertionType assertionType)
     : m_assertionType(assertionType)
 {
@@ -313 +313 @@
         }
     };
-    RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() PID %d acquiring assertion for process with PID %d, name '%s'", this, getpid(), pid, name.utf8().data());
+    RELEASE_LOG(ProcessSuspension, "%p - ProcessAssertion() PID %d acquiring assertion for process with PID %d, name '%s'", this, getpid(), pid, reason.characters());
     
-    m_assertion = adoptNS([[BKSProcessAssertion alloc] initWithPID:pid flags:flagsForAssertionType(assertionType) reason:toBKSProcessAssertionReason(assertionType) name:(NSString *)name withHandler:handler]);
+    NSString *nsReason = [NSString stringWithCString:reason.characters() encoding:NSASCIIStringEncoding];
+    m_assertion = adoptNS([[BKSProcessAssertion alloc] initWithPID:pid flags:flagsForAssertionType(assertionType) reason:toBKSProcessAssertionReason(assertionType) name:nsReason withHandler:handler]);
+
     m_assertion.get().invalidationHandler = ^() {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -355 +357 @@
 }
 
-ProcessAndUIAssertion::ProcessAndUIAssertion(pid_t pid, const String& reason, ProcessAssertionType assertionType)
+ProcessAndUIAssertion::ProcessAndUIAssertion(pid_t pid, ASCIILiteral reason, ProcessAssertionType assertionType)
     : ProcessAssertion(pid, reason, assertionType)
 {