Duplicate validateUserInterfaceItem in WKWebView

https://bugs.webkit.org/show_bug.cgi?id=150873

Reviewed by Anders Carlsson.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView changeFont:]):
(-[WKWebView startSpeaking:]):
(-[WKWebView validateUserInterfaceItem:]):
(-[WKWebView goBack:]):

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 451ca15cfe8a27eabc974354d13d0f0b6ebeb591..897f31f09090d059d6f70a704851cd0d6ae713c6 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2015-11-03  Tim Horton  <timothy_horton@apple.com>
+
+        Duplicate validateUserInterfaceItem in WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=150873
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView changeFont:]):
+        (-[WKWebView startSpeaking:]):
+        (-[WKWebView validateUserInterfaceItem:]):
+        (-[WKWebView goBack:]):
+
 2015-11-03  Geoffrey Garen  <ggaren@apple.com>
 
         Provide a way to turn off const in WebKit2.

diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
index b4f5762b3543248ff4486454ca0c6189dce5e64d..0f757d6f7db87fef4385c01dbf7813f4103a7898 100644 (file)
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
@@ -2061,11 +2061,6 @@ WEBCORE_COMMAND(yankAndSelect)
     _impl->changeFontFromFontPanel();
 }
 
-- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
-{
-    return _impl->validateUserInterfaceItem(item);
-}
-
 - (IBAction)startSpeaking:(id)sender
 {
     _impl->startSpeaking();
@@ -4073,7 +4068,7 @@ static inline WebKit::FindOptions toFindOptions(_WKFindOptions wkFindOptions)
         return YES;
     }
 
-    return NO;
+    return _impl->validateUserInterfaceItem(item);
 }
 
 - (IBAction)goBack:(id)sender