[PlayStation] Add stubs for WebContextMenuClient
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Jan 2020 03:10:18 +0000 (03:10 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Jan 2020 03:10:18 +0000 (03:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=206324

Reviewed by Don Olmstead.

* WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
(WebKit::WebContextMenuClient::lookUpInDictionary):
(WebKit::WebContextMenuClient::isSpeaking):
(WebKit::WebContextMenuClient::speak):
(WebKit::WebContextMenuClient::stopSpeaking):
* WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp:
(WebKit::WebContextMenuClient::lookUpInDictionary): Deleted.
(WebKit::WebContextMenuClient::isSpeaking): Deleted.
(WebKit::WebContextMenuClient::speak): Deleted.
(WebKit::WebContextMenuClient::stopSpeaking): Deleted.
Bring GTK/WPE stubs down for broader use.

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

Source/WebKit/ChangeLog
Source/WebKit/SourcesWPE.txt
Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp
Source/WebKit/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp
Source/WebKit/WebProcess/WebCoreSupport/wpe/WebContextMenuClientWPE.cpp [deleted file]

index 1dad9a7..ed3f812 100644 (file)
@@ -1,5 +1,24 @@
 2020-01-15  Ross Kirsling  <ross.kirsling@sony.com>
 
+        [PlayStation] Add stubs for WebContextMenuClient
+        https://bugs.webkit.org/show_bug.cgi?id=206324
+
+        Reviewed by Don Olmstead.
+
+        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+        (WebKit::WebContextMenuClient::lookUpInDictionary):
+        (WebKit::WebContextMenuClient::isSpeaking):
+        (WebKit::WebContextMenuClient::speak):
+        (WebKit::WebContextMenuClient::stopSpeaking):
+        * WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp:
+        (WebKit::WebContextMenuClient::lookUpInDictionary): Deleted.
+        (WebKit::WebContextMenuClient::isSpeaking): Deleted.
+        (WebKit::WebContextMenuClient::speak): Deleted.
+        (WebKit::WebContextMenuClient::stopSpeaking): Deleted.
+        Bring GTK/WPE stubs down for broader use.
+
+2020-01-15  Ross Kirsling  <ross.kirsling@sony.com>
+
         [PlayStation] Add stub for WebPopupMenu::setUpPlatformData
         https://bugs.webkit.org/show_bug.cgi?id=206323
 
index 0006175..ea7ff8d 100644 (file)
@@ -241,7 +241,6 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp
 
 WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
 
-WebProcess/WebCoreSupport/wpe/WebContextMenuClientWPE.cpp
 WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
 
 WebProcess/WebPage/AcceleratedSurface.cpp
index a36c083..f1bcdbd 100644 (file)
@@ -70,6 +70,27 @@ void WebContextMenuClient::searchWithGoogle(const Frame* frame)
         page->mainFrame().loader().urlSelected(URL { URL { }, url }, { }, nullptr, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, ShouldOpenExternalURLsPolicy::ShouldNotAllow);
     }
 }
+
+void WebContextMenuClient::lookUpInDictionary(WebCore::Frame*)
+{
+    notImplemented();
+}
+
+bool WebContextMenuClient::isSpeaking()
+{
+    notImplemented();
+    return false;
+}
+
+void WebContextMenuClient::speak(const String&)
+{
+    notImplemented();
+}
+
+void WebContextMenuClient::stopSpeaking()
+{
+    notImplemented();
+}
 #endif
 
 #if USE(ACCESSIBILITY_CONTEXT_MENUS)
index 2fe27cf..708df2b 100644 (file)
 #if ENABLE(CONTEXT_MENUS)
 
 #include "WebPage.h"
-#include <WebCore/NotImplemented.h>
 
 namespace WebKit {
-using namespace WebCore;
-
-void WebContextMenuClient::lookUpInDictionary(Frame*)
-{
-    notImplemented();
-}
-
-bool WebContextMenuClient::isSpeaking()
-{
-    notImplemented();
-    return false;
-}
-
-void WebContextMenuClient::speak(const String&)
-{
-    notImplemented();
-}
-
-void WebContextMenuClient::stopSpeaking()
-{
-    notImplemented();
-}
 
 void WebContextMenuClient::insertEmoji(Frame& frame)
 {
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebContextMenuClientWPE.cpp b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebContextMenuClientWPE.cpp
deleted file mode 100644 (file)
index ed034b0..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2014 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebContextMenuClient.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include <WebCore/NotImplemented.h>
-
-namespace WebKit {
-
-void WebContextMenuClient::lookUpInDictionary(WebCore::Frame*)
-{
-    notImplemented();
-}
-
-bool WebContextMenuClient::isSpeaking()
-{
-    notImplemented();
-    return false;
-}
-
-void WebContextMenuClient::speak(const String&)
-{
-    notImplemented();
-}
-
-void WebContextMenuClient::stopSpeaking()
-{
-    notImplemented();
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)