Remove 'nullable' to fix older iOS builds.
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Sep 2015 22:50:47 +0000 (22:50 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Sep 2015 22:50:47 +0000 (22:50 +0000)
* WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
(-[TestRunnerWKWebView scrollViewDidEndZooming:withView:atScale:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190087 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm

index e56049a..8f40242 100644 (file)
@@ -1,3 +1,10 @@
+2015-09-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove 'nullable' to fix older iOS builds.
+
+        * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
+        (-[TestRunnerWKWebView scrollViewDidEndZooming:withView:atScale:]):
+
 2015-09-21  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Use command-line argument to launch in regular or High DPI mode.
index d5c2baf..0c292a8 100644 (file)
@@ -33,7 +33,7 @@
 #if PLATFORM(IOS)
 @interface WKWebView ()
 
-- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable UIView *)view atScale:(CGFloat)scale;
+- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale;
 
 @end
 #endif
@@ -63,7 +63,7 @@
     [self.scrollView setZoomScale:scale animated:animated];
 }
 
-- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable UIView *)view atScale:(CGFloat)scale
+- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale
 {
     [super scrollViewDidEndZooming:scrollView withView:view atScale:scale];