Title: [221934] trunk/Source/WebKit
Revision
221934
Author
m...@apple.com
Date
2017-09-12 12:39:56 -0700 (Tue, 12 Sep 2017)

Log Message

Tried to fix the iOS 10 build after r221930.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
(-[WKWebView _setDragInteractionPolicy:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (221933 => 221934)


--- trunk/Source/WebKit/ChangeLog	2017-09-12 19:28:54 UTC (rev 221933)
+++ trunk/Source/WebKit/ChangeLog	2017-09-12 19:39:56 UTC (rev 221934)
@@ -1,5 +1,13 @@
 2017-09-12  Dan Bernstein  <m...@apple.com>
 
+        Tried to fix the iOS 10 build after r221930.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        (-[WKWebView _setDragInteractionPolicy:]):
+
+2017-09-12  Dan Bernstein  <m...@apple.com>
+
         Update availability annotations to match the macOS 10.13 and iOS 11.0 GM seed SDKs
         https://bugs.webkit.org/show_bug.cgi?id=176793
 

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (221933 => 221934)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2017-09-12 19:28:54 UTC (rev 221933)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2017-09-12 19:39:56 UTC (rev 221934)
@@ -312,7 +312,7 @@
     RetainPtr<WKTextFinderClient> _textFinderClient;
 #endif
 
-#if PLATFORM(IOS) && ENABLE(DRAG_SUPPORT)
+#if PLATFORM(IOS)
     _WKDragInteractionPolicy _dragInteractionPolicy;
 #endif
 }
@@ -604,7 +604,7 @@
 
     pageToViewMap().add(_page.get(), self);
 
-#if PLATFORM(IOS) && ENABLE(DRAG_SUPPORT)
+#if PLATFORM(IOS)
     _dragInteractionPolicy = _WKDragInteractionPolicyDefault;
 #endif
 }
@@ -1133,8 +1133,6 @@
 
 #if PLATFORM(IOS)
 
-#if ENABLE(DRAG_SUPPORT)
-
 - (_WKDragInteractionPolicy)_dragInteractionPolicy
 {
     return _dragInteractionPolicy;
@@ -1146,11 +1144,11 @@
         return;
 
     _dragInteractionPolicy = policy;
+#if ENABLE(DRAG_SUPPORT)
     [_contentView _didChangeDragInteractionPolicy];
+#endif
 }
 
-#endif
-
 - (void)_populateArchivedSubviews:(NSMutableSet *)encodedViews
 {
     [super _populateArchivedSubviews:encodedViews];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to