Title: [201360] trunk/Source/WebKit/mac
- Revision
- 201360
- Author
- bda...@apple.com
- Date
- 2016-05-24 16:02:14 -0700 (Tue, 24 May 2016)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (201359 => 201360)
--- trunk/Source/WebKit/mac/ChangeLog 2016-05-24 22:28:20 UTC (rev 201359)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-05-24 23:02:14 UTC (rev 201360)
@@ -1,3 +1,17 @@
+2016-05-24 Beth Dakin <bda...@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 <beid...@apple.com>
Move to C++14.
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (201359 => 201360)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-24 22:28:20 UTC (rev 201359)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-24 23:02:14 UTC (rev 201360)
@@ -7238,6 +7238,10 @@
#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)
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (201359 => 201360)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-05-24 22:28:20 UTC (rev 201359)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-05-24 23:02:14 UTC (rev 201360)
@@ -6723,6 +6723,11 @@
{
}
+- (id)candidateList
+{
+ return nil;
+}
+
@end
#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (201359 => 201360)
--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2016-05-24 22:28:20 UTC (rev 201359)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2016-05-24 23:02:14 UTC (rev 201360)
@@ -299,4 +299,5 @@
- (void)updateWebViewAdditions;
- (BOOL)shouldRequestCandidates;
- (void)webViewAdditionsWillDestroyView;
+- (id)candidateList;
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
