Title: [211917] branches/safari-604.1.5-branch/Source/WebKit2
- Revision
- 211917
- Author
- matthew_han...@apple.com
- Date
- 2017-02-08 18:05:40 -0800 (Wed, 08 Feb 2017)
Log Message
Merge r211442. rdar://problem/30272380
Modified Paths
Diff
Modified: branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog (211916 => 211917)
--- branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog 2017-02-09 02:05:36 UTC (rev 211916)
+++ branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog 2017-02-09 02:05:40 UTC (rev 211917)
@@ -1,3 +1,22 @@
+2017-02-08 Matthew Hanson <matt_han...@apple.com>
+
+ Merge r211442. rdar://problem/30272380
+
+ 2017-01-31 Wenson Hsieh <wenson_hs...@apple.com>
+
+ 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]):
+
2017-02-07 Matthew Hanson <matt_han...@apple.com>
Merge r211752. rdar://problem/30119091
Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211916 => 211917)
--- branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-09 02:05:36 UTC (rev 211916)
+++ branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-09 02:05:40 UTC (rev 211917)
@@ -118,6 +118,9 @@
RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
RetainPtr<UITapGestureRecognizer> _twoFingerSingleTapGestureRecognizer;
RetainPtr<WKInspectorNodeSearchGestureRecognizer> _inspectorNodeSearchGestureRecognizer;
+#if ENABLE(DATA_INTERACTION)
+ RetainPtr<UILongPressGestureRecognizer> _dataInteractionGestureRecognizer;
+#endif
RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
@@ -185,10 +188,7 @@
BOOL _needsDeferredEndScrollingSelectionUpdate;
#if ENABLE(DATA_INTERACTION)
- RetainPtr<UILongPressGestureRecognizer> _dataInteractionGestureRecognizer;
- RetainPtr<UIImage> _currentDataInteractionImage;
- CGPoint _currentDataInteractionOrigin;
- BOOL _shouldHandleLongPressActionAfterDataInteraction;
+ WebKit::WKDataInteractionState _dataInteractionState;
#endif
}
Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211916 => 211917)
--- branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-09 02:05:36 UTC (rev 211916)
+++ branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-09 02:05:40 UTC (rev 211917)
@@ -849,7 +849,7 @@
- (BOOL)resignFirstResponder
{
#if ENABLE(DATA_INTERACTION)
- _shouldHandleLongPressActionAfterDataInteraction = NO;
+ _dataInteractionState.shouldHandleLongPressAction = NO;
#endif
// FIXME: Maybe we should call resignFirstResponder on the superclass
// and do nothing if the return value is NO.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
