Diff
Modified: trunk/Source/WebKit2/ChangeLog (213064 => 213065)
--- trunk/Source/WebKit2/ChangeLog 2017-02-27 15:27:07 UTC (rev 213064)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-27 16:02:36 UTC (rev 213065)
@@ -1,3 +1,11 @@
+2017-02-26 Wenson Hsieh <[email protected]>
+
+ Unreviewed, revert all temporary build fixes for data interaction
+
+ Rolls out r212990, r212988 and r212984.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+
2017-02-27 Carlos Garcia Campos <[email protected]>
[GTK] Rendering artifacts when resizing the window in X11 with AC mode enabled
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (213064 => 213065)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-27 15:27:07 UTC (rev 213064)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-27 16:02:36 UTC (rev 213065)
@@ -189,9 +189,7 @@
#if ENABLE(DATA_INTERACTION)
WebKit::WKDataInteractionState _dataInteractionState;
BOOL _isPerformingDataInteractionOperation;
-#if HAS_DATA_INTERACTION_SPI
RetainPtr<WKDataInteraction> _dataInteraction;
-#endif
CGPoint _deferredActionSheetRequestLocation;
#endif
}
@@ -200,11 +198,8 @@
@interface WKContentView (WKInteraction) <UIGestureRecognizerDelegate, UIWebTouchEventsGestureRecognizerDelegate, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWKInteractionViewProtocol, WKFileUploadPanelDelegate, WKActionSheetAssistantDelegate
#if ENABLE(DATA_INTERACTION)
- , WKDataInteractionItemVisualTarget, WKViewDataInteractionDestinationDelegate
-#if HAS_DATA_INTERACTION_SPI
- , WKDataInteractionDelegate
+ , WKDataInteractionItemVisualTarget, WKDataInteractionDelegate, WKViewDataInteractionDestinationDelegate
#endif
-#endif
>
@property (nonatomic, readonly) CGPoint lastInteractionLocation;
Modified: trunk/Tools/ChangeLog (213064 => 213065)
--- trunk/Tools/ChangeLog 2017-02-27 15:27:07 UTC (rev 213064)
+++ trunk/Tools/ChangeLog 2017-02-27 16:02:36 UTC (rev 213065)
@@ -1,3 +1,14 @@
+2017-02-26 Wenson Hsieh <[email protected]>
+
+ Unreviewed, revert all temporary build fixes for data interaction
+
+ Rolls out r212990, r212988 and r212984.
+
+ * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+ * TestWebKitAPI/ios/DataInteractionSimulator.h:
+ * TestWebKitAPI/ios/DataInteractionSimulator.mm:
+ (-[DataInteractionSimulator _advanceProgress]):
+
2017-02-27 Alex Christensen <[email protected]>
[libwebrtc] Enable WebRTC in some Production Builds
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (213064 => 213065)
--- trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-02-27 15:27:07 UTC (rev 213064)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-02-27 16:02:36 UTC (rev 213065)
@@ -25,7 +25,7 @@
#include "config.h"
-#if 0
+#if ENABLE(DATA_INTERACTION)
#import "DataInteractionSimulator.h"
#import "PlatformUtilities.h"
Modified: trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h (213064 => 213065)
--- trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h 2017-02-27 15:27:07 UTC (rev 213064)
+++ trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h 2017-02-27 16:02:36 UTC (rev 213065)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
+#if ENABLE(DATA_INTERACTION)
#import "TestWKWebView.h"
#import <UIKit/UIItemProvider.h>
Modified: trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm (213064 => 213065)
--- trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm 2017-02-27 15:27:07 UTC (rev 213064)
+++ trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm 2017-02-27 16:02:36 UTC (rev 213065)
@@ -26,7 +26,7 @@
#include "config.h"
#include "DataInteractionSimulator.h"
-#if 0
+#if ENABLE(DATA_INTERACTION)
#import "PlatformUtilities.h"
#import <UIKit/UIItemProvider_Private.h>
@@ -147,7 +147,7 @@
switch (_phase) {
case DataInteractionBeginning: {
NSMutableArray<UIItemProvider *> *itemProviders = [NSMutableArray array];
- NSArray *items = [_webView _simulatedItemsForSession:_dataInteractionSession.get()];
+ NSArray<WKDataInteractionItem *> *items = [_webView _simulatedItemsForSession:_dataInteractionSession.get()];
if (!items.count) {
_phase = DataInteractionCancelled;
_currentProgress = 1;
@@ -155,15 +155,11 @@
return;
}
-#if HAS_DATA_INTERACTION_ITEMS
for (WKDataInteractionItem *item in items)
[itemProviders addObject:item.itemProvider];
-#endif
_dataInteractionInfo = adoptNS([[MockDataInteractionInfo alloc] initWithProvider:itemProviders.firstObject location:self._currentLocation window:[_webView window]]);
-#if HAS_DATA_INTERACTION_ITEMS
[_dataInteractionSession setItems:items];
-#endif
[_webView _simulateWillBeginDataInteractionWithSession:_dataInteractionSession.get()];
_phase = DataInteractionBegan;
break;
