Title: [195327] trunk/Source/WebKit/mac
Revision
195327
Author
[email protected]
Date
2016-01-19 16:56:50 -0800 (Tue, 19 Jan 2016)

Log Message

32-bit build fix.

* WebView/WebView.mm:
(-[WebView updateWebViewAdditions]):
(-[WebView showCandidates:forString:inRect:view:completionHandler:]):
* WebView/WebViewInternal.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (195326 => 195327)


--- trunk/Source/WebKit/mac/ChangeLog	2016-01-20 00:55:21 UTC (rev 195326)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-01-20 00:56:50 UTC (rev 195327)
@@ -1,5 +1,14 @@
 2016-01-19  Beth Dakin  <[email protected]>
 
+        32-bit build fix.
+
+        * WebView/WebView.mm:
+        (-[WebView updateWebViewAdditions]):
+        (-[WebView showCandidates:forString:inRect:view:completionHandler:]):
+        * WebView/WebViewInternal.h:
+
+2016-01-19  Beth Dakin  <[email protected]>
+
         Move away from NSSpellChecker's showCandidates method
         https://bugs.webkit.org/show_bug.cgi?id=153254
         -and corresponding-

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (195326 => 195327)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2016-01-20 00:55:21 UTC (rev 195326)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2016-01-20 00:56:50 UTC (rev 195327)
@@ -6605,7 +6605,7 @@
 {
 }
 
-- (void)showCandidates:(NSArray<NSTextCheckingResult *> *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString view:(NSView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock
+- (void)showCandidates:(NSArray *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString view:(NSView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock
 {
 }
 

Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (195326 => 195327)


--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h	2016-01-20 00:55:21 UTC (rev 195326)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h	2016-01-20 00:56:50 UTC (rev 195327)
@@ -291,5 +291,5 @@
 
 @interface WebView (WebUpdateWebViewAdditions)
 - (void)updateWebViewAdditions;
-- (void)showCandidates:(NSArray<NSTextCheckingResult *> *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString view:(NSView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock;
+- (void)showCandidates:(NSArray *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString view:(NSView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock;
 @end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to