Title: [259505] trunk/Source/WebKit
Revision
259505
Author
[email protected]
Date
2020-04-03 13:13:41 -0700 (Fri, 03 Apr 2020)

Log Message

[Cocoa] Update MESSAGE_CHECK macros used in WebProcessProxy::didCreateSleepDisabler/WebProcessProxy::didDestroySleepDisabler
<https://webkit.org/b/209981>
<rdar://problem/61237674>

Reviewed by Darin Adler.

* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didCreateSleepDisabler):
- Remove MESSAGE_CHECK for `identifier` since decoding detects
  invalid values.
- Add MESSAGE_CHECK for `reason` since a NULL string would cause
  CFStringCreateWithCString() to crash later.
(WebKit::WebProcessProxy::didDestroySleepDisabler):
- Remove MESSAGE_CHECK for `identifier` since decoding detects
  invalid values.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (259504 => 259505)


--- trunk/Source/WebKit/ChangeLog	2020-04-03 20:12:54 UTC (rev 259504)
+++ trunk/Source/WebKit/ChangeLog	2020-04-03 20:13:41 UTC (rev 259505)
@@ -1,3 +1,21 @@
+2020-04-03  David Kilzer  <[email protected]>
+
+        [Cocoa] Update MESSAGE_CHECK macros used in WebProcessProxy::didCreateSleepDisabler/WebProcessProxy::didDestroySleepDisabler
+        <https://webkit.org/b/209981>
+        <rdar://problem/61237674>
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::didCreateSleepDisabler):
+        - Remove MESSAGE_CHECK for `identifier` since decoding detects
+          invalid values.
+        - Add MESSAGE_CHECK for `reason` since a NULL string would cause
+          CFStringCreateWithCString() to crash later.
+        (WebKit::WebProcessProxy::didDestroySleepDisabler):
+        - Remove MESSAGE_CHECK for `identifier` since decoding detects
+          invalid values.
+
 2020-04-03  Megan Gardner  <[email protected]>
 
         Color Form Control does not come up on second selection in macCatalyst

Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (259504 => 259505)


--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2020-04-03 20:12:54 UTC (rev 259504)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2020-04-03 20:13:41 UTC (rev 259505)
@@ -1782,7 +1782,7 @@
 
 void WebProcessProxy::didCreateSleepDisabler(SleepDisablerIdentifier identifier, const String& reason, bool display)
 {
-    MESSAGE_CHECK(identifier);
+    MESSAGE_CHECK(!reason.isNull());
     auto sleepDisabler = makeUnique<WebCore::SleepDisabler>(reason.utf8().data(), display ? PAL::SleepDisabler::Type::Display : PAL::SleepDisabler::Type::System);
     m_sleepDisablers.add(identifier, WTFMove(sleepDisabler));
 }
@@ -1789,7 +1789,6 @@
 
 void WebProcessProxy::didDestroySleepDisabler(SleepDisablerIdentifier identifier)
 {
-    MESSAGE_CHECK(identifier);
     m_sleepDisablers.remove(identifier);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to