[PlayStation] Add stub for WebPopupMenu::setUpPlatformData
https://bugs.webkit.org/show_bug.cgi?id=206323
Reviewed by Don Olmstead.
* SourcesGTK.txt:
* SourcesWPE.txt:
* WebProcess/WebCoreSupport/WebPopupMenu.cpp:
(WebKit::WebPopupMenu::setUpPlatformData):
* WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp: Removed.
* WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp: Removed.
Bring GTK/WPE stub down for broader use.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254658 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 3874b34..1dad9a7 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,20 @@
2020-01-15 Ross Kirsling <ross.kirsling@sony.com>
+ [PlayStation] Add stub for WebPopupMenu::setUpPlatformData
+ https://bugs.webkit.org/show_bug.cgi?id=206323
+
+ Reviewed by Don Olmstead.
+
+ * SourcesGTK.txt:
+ * SourcesWPE.txt:
+ * WebProcess/WebCoreSupport/WebPopupMenu.cpp:
+ (WebKit::WebPopupMenu::setUpPlatformData):
+ * WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp: Removed.
+ * WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp: Removed.
+ Bring GTK/WPE stub down for broader use.
+
+2020-01-15 Ross Kirsling <ross.kirsling@sony.com>
+
[PlayStation] Add stubs for WebEditorClient
https://bugs.webkit.org/show_bug.cgi?id=206320
diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
index 97cca34..6ca1a72 100644
--- a/Source/WebKit/SourcesGTK.txt
+++ b/Source/WebKit/SourcesGTK.txt
@@ -404,7 +404,6 @@
WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp
WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
-WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
index afcfdd9..0006175 100644
--- a/Source/WebKit/SourcesWPE.txt
+++ b/Source/WebKit/SourcesWPE.txt
@@ -243,7 +243,6 @@
WebProcess/WebCoreSupport/wpe/WebContextMenuClientWPE.cpp
WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
-WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp
WebProcess/WebPage/AcceleratedSurface.cpp
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebPopupMenu.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebPopupMenu.cpp
index 791e947..9e3bf24 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebPopupMenu.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebPopupMenu.cpp
@@ -28,6 +28,7 @@
#include "WebPageProxyMessages.h"
#include "WebProcess.h"
#include <WebCore/FrameView.h>
+#include <WebCore/NotImplemented.h>
#include <WebCore/PopupMenuClient.h>
namespace WebKit {
@@ -136,4 +137,11 @@
{
}
+#if !PLATFORM(COCOA) && !PLATFORM(WIN)
+void WebPopupMenu::setUpPlatformData(const WebCore::IntRect&, PlatformPopupMenuData&)
+{
+ notImplemented();
+}
+#endif
+
} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp b/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
deleted file mode 100644
index d5ad21d..0000000
--- a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- *
- * 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 "WebPopupMenu.h"
-
-#include "PlatformPopupMenuData.h"
-#include <WebCore/NotImplemented.h>
-
-namespace WebKit {
-using namespace WebCore;
-
-void WebPopupMenu::setUpPlatformData(const IntRect&, PlatformPopupMenuData&)
-{
- notImplemented();
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp
deleted file mode 100644
index bab837b..0000000
--- a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp
+++ /dev/null
@@ -1,38 +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 "WebPopupMenu.h"
-
-#include <WebCore/NotImplemented.h>
-
-namespace WebKit {
-
-void WebPopupMenu::setUpPlatformData(const WebCore::IntRect&, PlatformPopupMenuData&)
-{
- notImplemented();
-}
-
-} // namespace WebKit
