Speculative Yosemite fix after r198872.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Mar 2016 06:00:42 +0000 (06:00 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Mar 2016 06:00:42 +0000 (06:00 +0000)
* UIProcess/Cocoa/WebAutomationSessionCocoa.mm:
(WebKit::WebAutomationSession::platformSimulateKeySequence):
Yosemite didn't like _Nullable.

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/Cocoa/WebAutomationSessionCocoa.mm

index a0826e7..6ea1868 100644 (file)
@@ -1,3 +1,11 @@
+2016-03-30  Alex Christensen  <achristensen@webkit.org>
+
+        Speculative Yosemite fix after r198872.
+
+        * UIProcess/Cocoa/WebAutomationSessionCocoa.mm:
+        (WebKit::WebAutomationSession::platformSimulateKeySequence):
+        Yosemite didn't like _Nullable.
+
 2016-03-30  Yongjun Zhang  <yongjun_zhang@apple.com>
 
         Need to expose makeAllShadowRootsOpen in WKWebProcessPlugInScriptWorld.
index 1241a2d..5bca6bf 100644 (file)
@@ -446,7 +446,7 @@ void WebAutomationSession::platformSimulateKeySequence(WebPageProxy& page, const
     NSInteger windowNumber = window.windowNumber;
     NSPoint eventPosition = NSMakePoint(0, window.frame.size.height);
 
-    [text enumerateSubstringsInRange:NSMakeRange(0, text.length) options:NSStringEnumerationByComposedCharacterSequences usingBlock:^(NSString * _Nullable substring, NSRange substringRange, NSRange enclosingRange, BOOL * _Nonnull stop) {
+    [text enumerateSubstringsInRange:NSMakeRange(0, text.length) options:NSStringEnumerationByComposedCharacterSequences usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
         [eventsToBeSent addObject:[NSEvent keyEventWithType:NSEventTypeKeyDown location:eventPosition modifierFlags:modifiers timestamp:timestamp windowNumber:windowNumber context:nil characters:substring charactersIgnoringModifiers:substring isARepeat:NO keyCode:0]];
         [eventsToBeSent addObject:[NSEvent keyEventWithType:NSEventTypeKeyUp location:eventPosition modifierFlags:modifiers timestamp:timestamp windowNumber:windowNumber context:nil characters:substring charactersIgnoringModifiers:substring isARepeat:NO keyCode:0]];
     }];