Candidates should work with input methods
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 May 2016 23:02:14 +0000 (23:02 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 May 2016 23:02:14 +0000 (23:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=158042
-and corresponding-
rdar://problem/26205228

Reviewed by Tim Horton.

* WebView/WebHTMLView.mm:
* WebView/WebView.mm:
(-[WebView candidateList]):
* WebView/WebViewInternal.h:

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

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebHTMLView.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewInternal.h

index d0c2cb7..1497c04 100644 (file)
@@ -1,3 +1,17 @@
+2016-05-24  Beth Dakin  <bdakin@apple.com>
+
+        Candidates should work with input methods
+        https://bugs.webkit.org/show_bug.cgi?id=158042
+        -and corresponding-
+        rdar://problem/26205228
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebHTMLView.mm:
+        * WebView/WebView.mm:
+        (-[WebView candidateList]):
+        * WebView/WebViewInternal.h:
+
 2016-05-22  Brady Eidson  <beidson@apple.com>
 
         Move to C++14.
index b723c8f..0ebe95a 100644 (file)
@@ -7238,6 +7238,10 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
 #endif // PLATFORM(IOS)
 }
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WebHTMLViewWebNSTextInputSupportAdditions.mm>
+#endif
+
 @end
 
 @implementation WebHTMLView (WebDocumentPrivateProtocols)
index 2d96b52..b014b6b 100644 (file)
@@ -6723,6 +6723,11 @@ static WebFrame *incrementFrame(WebFrame *frame, WebFindOptions options = 0)
 {
 }
 
+- (id)candidateList
+{
+    return nil;
+}
+
 @end
 #endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
 
index cd1bb51..375d155 100644 (file)
@@ -299,4 +299,5 @@ OBJC_CLASS NSTextAlternatives;
 - (void)updateWebViewAdditions;
 - (BOOL)shouldRequestCandidates;
 - (void)webViewAdditionsWillDestroyView;
+- (id)candidateList;
 @end