Changeset 211442 in webkit


Ignore:
Timestamp:
Jan 31, 2017 11:49:34 AM (7 years ago)
Author:
Wenson Hsieh
Message:

Crash when trying to compute global location when the WKContentView does not have a window
https://bugs.webkit.org/show_bug.cgi?id=167627
<rdar://problem/30272380>

Reviewed by Beth Dakin.

Moves data interaction state out of OpenSource and into WebKitAdditions. Work towards fixing a crash in
<rdar://problem/30272380>.

  • UIProcess/ios/WKContentViewInteraction.h:
  • UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView resignFirstResponder]):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r211441 r211442  
     12017-01-31  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Crash when trying to compute global location when the WKContentView does not have a window
     4        https://bugs.webkit.org/show_bug.cgi?id=167627
     5        <rdar://problem/30272380>
     6
     7        Reviewed by Beth Dakin.
     8
     9        Moves data interaction state out of OpenSource and into WebKitAdditions. Work towards fixing a crash in
     10        <rdar://problem/30272380>.
     11
     12        * UIProcess/ios/WKContentViewInteraction.h:
     13        * UIProcess/ios/WKContentViewInteraction.mm:
     14        (-[WKContentView resignFirstResponder]):
     15
    1162017-01-31  Youenn Fablet  <youennf@gmail.com>
    217
  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

    r211356 r211442  
    119119    RetainPtr<UITapGestureRecognizer> _twoFingerSingleTapGestureRecognizer;
    120120    RetainPtr<WKInspectorNodeSearchGestureRecognizer> _inspectorNodeSearchGestureRecognizer;
     121#if ENABLE(DATA_INTERACTION)
     122    RetainPtr<UILongPressGestureRecognizer> _dataInteractionGestureRecognizer;
     123#endif
    121124
    122125    RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
     
    186189
    187190#if ENABLE(DATA_INTERACTION)
    188     RetainPtr<UILongPressGestureRecognizer> _dataInteractionGestureRecognizer;
    189     RetainPtr<UIImage> _currentDataInteractionImage;
    190     CGPoint _currentDataInteractionOrigin;
    191     BOOL _shouldHandleLongPressActionAfterDataInteraction;
     191    WebKit::WKDataInteractionState _dataInteractionState;
    192192#endif
    193193}
  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

    r211356 r211442  
    852852{
    853853#if ENABLE(DATA_INTERACTION)
    854     _shouldHandleLongPressActionAfterDataInteraction = NO;
     854    _dataInteractionState.shouldHandleLongPressAction = NO;
    855855#endif
    856856    // FIXME: Maybe we should call resignFirstResponder on the superclass
Note: See TracChangeset for help on using the changeset viewer.