Title: [211442] trunk/Source/WebKit2
- Revision
- 211442
- Author
- [email protected]
- Date
- 2017-01-31 11:49:34 -0800 (Tue, 31 Jan 2017)
Log 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]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (211441 => 211442)
--- trunk/Source/WebKit2/ChangeLog 2017-01-31 19:37:24 UTC (rev 211441)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-31 19:49:34 UTC (rev 211442)
@@ -1,3 +1,18 @@
+2017-01-31 Wenson Hsieh <[email protected]>
+
+ 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-01-31 Youenn Fablet <[email protected]>
[WebRTC] Add support for WK2 libwebrtc endpoint
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211441 => 211442)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-01-31 19:37:24 UTC (rev 211441)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-01-31 19:49:34 UTC (rev 211442)
@@ -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: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211441 => 211442)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-01-31 19:37:24 UTC (rev 211441)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-01-31 19:49:34 UTC (rev 211442)
@@ -851,7 +851,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
