Changeset 260290 in webkit


Ignore:
Timestamp:
Apr 17, 2020 3:08:31 PM (4 years ago)
Author:
ddkilzer@apple.com
Message:

REGRESSION (r234105): [iOS] WKColorButton leaks a UIColor
<​https://webkit.org/b/210658>
<rdar://problem/61938137>

Reviewed by Darin Adler.

Source/WebCore:

  • html/ColorInputType.cpp:

(WebCore::ColorInputType::isKeyboardFocusable const):

  • page/Chrome.cpp:

(WebCore::Chrome::createColorChooser):

  • Drive-by fix of unreachable code on PLATFORM(IOS_FAMILY).

Source/WebKit:

  • UIProcess/ios/forms/WKFormColorPicker.mm:

(-[WKColorButton dealloc]): Add.

  • Release _color instance variable to fix leak.
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r260277 r260290  
     12020-04-17  David Kilzer  <ddkilzer@apple.com>
     2
     3        REGRESSION (r234105): [iOS] WKColorButton leaks a UIColor
     4        <https://webkit.org/b/210658>
     5        <rdar://problem/61938137>
     6
     7        Reviewed by Darin Adler.
     8
     9        * html/ColorInputType.cpp:
     10        (WebCore::ColorInputType::isKeyboardFocusable const):
     11        * page/Chrome.cpp:
     12        (WebCore::Chrome::createColorChooser):
     13        - Drive-by fix of unreachable code on PLATFORM(IOS_FAMILY).
     14
    1152020-04-17  Don Olmstead  <don.olmstead@sony.com>
    216

  • trunk/Source/WebCore/html/ColorInputType.cpp

    r258516 r260290  
    9595
    9696    return element()->isTextFormControlFocusable();
     97#else
     98    return false;
    9799#endif
    98     return false;
    99100}
    100101

  • trunk/Source/WebCore/page/Chrome.cpp

    r258487 r260290  
    422422{
    423423#if PLATFORM(IOS_FAMILY)
     424    UNUSED_PARAM(client);
     425    UNUSED_PARAM(initialColor);
    424426    return nullptr;
    425 #endif
     427#else
    426428    notifyPopupOpeningObservers();
    427429    return m_client.createColorChooser(client, initialColor);
     430#endif
    428431}
    429432

  • trunk/Source/WebKit/ChangeLog

    r260284 r260290  
     12020-04-17  David Kilzer  <ddkilzer@apple.com>
     2
     3        REGRESSION (r234105): [iOS] WKColorButton leaks a UIColor
     4        <https://webkit.org/b/210658>
     5        <rdar://problem/61938137>
     6
     7        Reviewed by Darin Adler.
     8
     9        * UIProcess/ios/forms/WKFormColorPicker.mm:
     10        (-[WKColorButton dealloc]): Add.
     11        - Release _color instance variable to fix leak.
     12
    1132020-04-17  Per Arne Vollan  <pvollan@apple.com>
    214

  • trunk/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm

    r259843 r260290  
    7676}
    7777
     78- (void)dealloc
     79{
     80    [_color release];
     81    _color = nil;
     82
     83    [super dealloc];
     84}
     85
    7886@end
    7987
Note: See TracChangeset for help on using the changeset viewer.