Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184723 => 184724)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 18:08:34 UTC (rev 184723)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 18:24:59 UTC (rev 184724)
@@ -1,3 +1,20 @@
+2015-05-21 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r184716.
+
+ 2015-05-21 Alexey Proskuryakov <a...@apple.com>
+
+ Build fix. Silence some deprecation warnings.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel _presentPopoverWithContentViewController:animated:]):
+ * UIProcess/ios/forms/WKFormInputControl.mm:
+ (-[WKDateTimePopover initWithView:datePickerMode:]):
+ * UIProcess/ios/forms/WKFormPopover.h:
+ * UIProcess/ios/forms/WKFormPopover.mm:
+ * UIProcess/ios/forms/WKFormSelectPopover.mm:
+ (-[WKSelectPopover initWithView:hasGroups:]):
+
2015-05-20 Matthew Hanson <matthew_han...@apple.com>
Merge r184679. rdar://problem/20990162
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (184723 => 184724)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-05-21 18:08:34 UTC (rev 184723)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-05-21 18:24:59 UTC (rev 184724)
@@ -290,7 +290,10 @@
BOOL _usingCamera;
RetainPtr<UIImagePickerController> _imagePicker;
RetainPtr<UIViewController> _presentationViewController; // iPhone always. iPad for Fullscreen Camera.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
RetainPtr<UIPopoverController> _presentationPopover; // iPad for action sheet and Photo Library.
+#pragma clang diagnostic pop
RetainPtr<UIDocumentMenuViewController> _documentMenuController;
RetainPtr<UIAlertController> _actionSheetController;
}
@@ -565,7 +568,10 @@
{
[self _dismissDisplayAnimated:animated];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_presentationPopover = adoptNS([[UIPopoverController alloc] initWithContentViewController:contentViewController]);
+#pragma clang diagnostic pop
[_presentationPopover setDelegate:self];
[_presentationPopover presentPopoverFromRect:CGRectIntegral(CGRectMake(_interactionPoint.x, _interactionPoint.y, 1, 1)) inView:_view permittedArrowDirections:UIPopoverArrowDirectionAny animated:animated];
}
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormInputControl.mm (184723 => 184724)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormInputControl.mm 2015-05-21 18:08:34 UTC (rev 184723)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormInputControl.mm 2015-05-21 18:24:59 UTC (rev 184724)
@@ -341,7 +341,10 @@
#pragma clang diagnostic pop
[navigationItem setRightBarButtonItem:clearButton];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
RetainPtr<UIPopoverController> controller = adoptNS([[UIPopoverController alloc] initWithContentViewController:navigationController.get()]);
+#pragma clang diagnostic pop
[self setPopoverController:controller.get()];
return self;
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormPopover.h (184723 => 184724)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormPopover.h 2015-05-21 18:08:34 UTC (rev 184723)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormPopover.h 2015-05-21 18:24:59 UTC (rev 184724)
@@ -38,7 +38,10 @@
- (UIPopoverArrowDirection)popoverArrowDirections;
@property(nonatomic, assign) CGPoint presentationPoint;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
@property(nonatomic, retain) UIPopoverController *popoverController;
+#pragma clang diagnostic pop
@property(nonatomic, assign) id <WKRotatingPopoverDelegate> dismissionDelegate;
@end
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormPopover.mm (184723 => 184724)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormPopover.mm 2015-05-21 18:08:34 UTC (rev 184723)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormPopover.mm 2015-05-21 18:24:59 UTC (rev 184724)
@@ -36,6 +36,9 @@
using namespace WebKit;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
@implementation WKFormRotatingAccessoryPopover {
WKContentView *_view;
}
@@ -178,4 +181,6 @@
@end
+#pragma clang diagnostic pop
+
#endif // PLATFORM(IOS)
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm (184723 => 184724)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2015-05-21 18:08:34 UTC (rev 184723)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2015-05-21 18:24:59 UTC (rev 184724)
@@ -401,7 +401,11 @@
else
popoverViewController.preferredContentSize = popoverSize;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
self.popoverController = [[[UIPopoverController alloc] initWithContentViewController:popoverViewController] autorelease];
+#pragma clang diagnostic pop
+
[navController release];
[[UIKeyboardImpl sharedInstance] setDelegate:_tableViewController.get()];
