Changeset 268482 in webkit


Ignore:
Timestamp:
Oct 14, 2020 1:27:42 PM (3 years ago)
Author:
Devin Rousso
Message:

REGRESSION (r268384): ASSERTION FAILED: _startCount > 1 in -[WKMouseDeviceObserver stop]
https://bugs.webkit.org/show_bug.cgi?id=217684
<rdar://problem/70272646>

Reviewed by Tim Horton.

The ASSERT was incorrect in that it's possible for _startCount to be equal to 1. Also
add a check to make sure _startCount doesn't overflow.

  • UIProcess/ios/WKMouseDeviceObserver.mm:

(-[WKMouseDeviceObserver stop]):

  • UIProcess/ios/WKStylusDeviceObserver.mm:

(-[WKStylusDeviceObserver stop]):

Location:
trunk/Source/WebKit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r268472 r268482  
     12020-10-14  Devin Rousso  <drousso@apple.com>
     2
     3        REGRESSION (r268384): ASSERTION FAILED: _startCount > 1 in -[WKMouseDeviceObserver stop]
     4        https://bugs.webkit.org/show_bug.cgi?id=217684
     5        <rdar://problem/70272646>
     6
     7        Reviewed by Tim Horton.
     8
     9        The `ASSERT` was incorrect in that it's possible for `_startCount` to be equal to `1`. Also
     10        add a check to make sure `_startCount` doesn't overflow.
     11
     12        * UIProcess/ios/WKMouseDeviceObserver.mm:
     13        (-[WKMouseDeviceObserver stop]):
     14        * UIProcess/ios/WKStylusDeviceObserver.mm:
     15        (-[WKStylusDeviceObserver stop]):
     16
    1172020-10-14  Sergio Villar Senin  <svillar@igalia.com>
    218
  • trunk/Source/WebKit/UIProcess/ios/WKMouseDeviceObserver.mm

    r268384 r268482  
    5959- (void)stop
    6060{
    61     ASSERT(_startCount > 1);
    62     if (--_startCount)
     61    ASSERT(_startCount);
     62    if (!_startCount || --_startCount)
    6363        return;
    6464
  • trunk/Source/WebKit/UIProcess/ios/WKStylusDeviceObserver.mm

    r268384 r268482  
    8989- (void)stop
    9090{
    91     ASSERT(_startCount > 1);
    92     if (--_startCount)
     91    ASSERT(_startCount);
     92    if (!_startCount || --_startCount)
    9393        return;
    9494
Note: See TracChangeset for help on using the changeset viewer.