Title: [226903] trunk/Source/WebKit
- Revision
- 226903
- Author
- ryanhad...@apple.com
- Date
- 2018-01-12 11:21:00 -0800 (Fri, 12 Jan 2018)
Log Message
Unreviewed, rolling out r226826.
Breaks internal builds.
Reverted changeset:
"Implement MultiDocument protocol for restoring focus to a
WKWebView"
https://bugs.webkit.org/show_bug.cgi?id=181510
https://trac.webkit.org/changeset/226826
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (226902 => 226903)
--- trunk/Source/WebKit/ChangeLog 2018-01-12 19:19:07 UTC (rev 226902)
+++ trunk/Source/WebKit/ChangeLog 2018-01-12 19:21:00 UTC (rev 226903)
@@ -1,3 +1,16 @@
+2018-01-12 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r226826.
+
+ Breaks internal builds.
+
+ Reverted changeset:
+
+ "Implement MultiDocument protocol for restoring focus to a
+ WKWebView"
+ https://bugs.webkit.org/show_bug.cgi?id=181510
+ https://trac.webkit.org/changeset/226826
+
2018-01-12 Wenson Hsieh <wenson_hs...@apple.com>
[WK2] Unify macOS and iOS codepaths in the UI process when starting a drag
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (226902 => 226903)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-01-12 19:19:07 UTC (rev 226902)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-01-12 19:21:00 UTC (rev 226903)
@@ -378,12 +378,6 @@
@interface UITextInputTraits : NSObject <UITextInputTraits, UITextInputTraits_Private, NSCopying>
@end
-@protocol UITextInputMultiDocument <NSObject>
-@optional
-- (void)_restoreFocusWithToken:(id <NSCopying, NSSecureCoding>)token completion:(void (^)(BOOL didRestore))completion;
-- (void)_preserveFocusWithToken:(id <NSCopying, NSSecureCoding>)token destructively:(BOOL)destructively;
-@end
-
@interface UITextInteractionAssistant : NSObject
@end
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (226902 => 226903)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2018-01-12 19:19:07 UTC (rev 226902)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2018-01-12 19:21:00 UTC (rev 226903)
@@ -242,7 +242,7 @@
@end
-@interface WKContentView (WKInteraction) <UIGestureRecognizerDelegate, UITextAutoscrolling, UITextInputMultiDocument, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWebTouchEventsGestureRecognizerDelegate, UIWKInteractionViewProtocol, WKActionSheetAssistantDelegate, WKFileUploadPanelDelegate
+@interface WKContentView (WKInteraction) <UIGestureRecognizerDelegate, UIWebTouchEventsGestureRecognizerDelegate, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWKInteractionViewProtocol, WKFileUploadPanelDelegate, WKActionSheetAssistantDelegate, UITextAutoscrolling
#if ENABLE(DATA_INTERACTION)
, UIDragInteractionDelegate, UIDropInteractionDelegate
#endif
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (226902 => 226903)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-01-12 19:19:07 UTC (rev 226902)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-01-12 19:21:00 UTC (rev 226903)
@@ -4127,18 +4127,6 @@
_fileUploadPanel = nil;
}
-#pragma mark - UITextInputMultiDocument
-
-- (void)_restoreFocusWithToken:(id <NSCopying, NSSecureCoding>)token
-{
- --_webView->_activeFocusedStateRetainCount;
-}
-
-- (void)_preserveFocusWithToken:(id <NSCopying, NSSecureCoding>)token destructively:(BOOL)destructively
-{
- ++_webView->_activeFocusedStateRetainCount;
-}
-
#pragma mark - Implementation of UIWebTouchEventsGestureRecognizerDelegate.
// FIXME: Remove once -gestureRecognizer:shouldIgnoreWebTouchWithEvent: is in UIWebTouchEventsGestureRecognizer.h. Refer to <rdar://problem/33217525> for more details.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
