Title: [187319] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187319
- Author
- [email protected]
- Date
- 2015-07-24 00:54:29 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187212. rdar://problem/21945775
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187318 => 187319)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:27 UTC (rev 187318)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:29 UTC (rev 187319)
@@ -1,5 +1,17 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187212. rdar://problem/21945775
+
+ 2015-07-22 Timothy Horton <[email protected]>
+
+ Fix the build
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+ (-[WKContentView cleanupInteraction]):
+
+2015-07-24 Matthew Hanson <[email protected]>
+
Merge r187199. rdar://problem/21945775
2015-07-22 Tim Horton <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187318 => 187319)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 07:54:27 UTC (rev 187318)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 07:54:29 UTC (rev 187319)
@@ -341,7 +341,9 @@
[_longPressGestureRecognizer setDelegate:self];
[self addGestureRecognizer:_longPressGestureRecognizer.get()];
+#if HAVE(LINK_PREVIEW)
[self _registerPreview];
+#endif
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_resetShowingTextStyle:) name:UIMenuControllerDidHideMenuNotification object:nil];
_showingTextStyleOptions = NO;
@@ -398,7 +400,10 @@
_inspectorNodeSearchGestureRecognizer = nil;
}
+#if HAVE(LINK_PREVIEW)
[self _unregisterPreview];
+#endif
+
if (_fileUploadPanel) {
[_fileUploadPanel setDelegate:nil];
[_fileUploadPanel dismiss];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
