Diff
Modified: trunk/Source/WebCore/ChangeLog (191428 => 191429)
--- trunk/Source/WebCore/ChangeLog 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebCore/ChangeLog 2015-10-22 02:27:15 UTC (rev 191429)
@@ -1,3 +1,12 @@
+2015-10-21 Gyuyoung Kim <gyuyoung....@webkit.org>
+
+ [EFL][GTK][WK2] Fix build break since r191402, r191401
+ https://bugs.webkit.org/show_bug.cgi?id=150432
+
+ Unreviewed EFL and GTK build fix.
+
+ * loader/EmptyClients.h:
+
2015-10-21 Alex Christensen <achristen...@webkit.org>
Build fix after r191422.
Modified: trunk/Source/WebCore/loader/EmptyClients.h (191428 => 191429)
--- trunk/Source/WebCore/loader/EmptyClients.h 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-10-22 02:27:15 UTC (rev 191429)
@@ -549,7 +549,9 @@
virtual ~EmptyContextMenuClient() { }
virtual void contextMenuDestroyed() override { }
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
+#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
+ virtual std::unique_ptr<ContextMenu> customizeMenu(std::unique_ptr<ContextMenu>) override { return nullptr; }
+#else
virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) override { return nullptr; }
#endif
virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*) override { }
Modified: trunk/Source/WebKit2/CMakeLists.txt (191428 => 191429)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-10-22 02:27:15 UTC (rev 191429)
@@ -359,7 +359,6 @@
UIProcess/WebDatabaseManagerProxy.cpp
UIProcess/WebDatabaseManagerProxyClient.cpp
UIProcess/WebEditCommandProxy.cpp
- UIProcess/WebFindClient.cpp
UIProcess/WebFormClient.cpp
UIProcess/WebFormSubmissionListenerProxy.cpp
UIProcess/WebFrameListenerProxy.cpp
Modified: trunk/Source/WebKit2/ChangeLog (191428 => 191429)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 02:27:15 UTC (rev 191429)
@@ -1,3 +1,25 @@
+2015-10-21 Gyuyoung Kim <gyuyoung....@webkit.org>
+
+ [EFL][GTK][WK2] Fix build break since r191402, r191401
+ https://bugs.webkit.org/show_bug.cgi?id=150432
+
+ Unreviewed EFL and GTK build fix.
+
+ * CMakeLists.txt:
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ (WebKit::WebView::createContextMenuProxy):
+ * UIProcess/CoordinatedGraphics/WebView.h:
+ * UIProcess/efl/WebContextMenuProxyEfl.cpp:
+ (WebKit::WebContextMenuProxyEfl::show):
+ * UIProcess/efl/WebContextMenuProxyEfl.h:
+ (WebKit::WebContextMenuProxyEfl::create): Deleted.
+ * UIProcess/efl/WebViewEfl.cpp:
+ (WebKit::WebViewEfl::createContextMenuProxy):
+ * UIProcess/efl/WebViewEfl.h:
+ * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+ (WebKit::WebContextMenuClient::customizeMenu):
+ * WebProcess/WebCoreSupport/WebContextMenuClient.h:
+
2015-10-21 Anders Carlsson <ander...@apple.com>
Get rid of WebContextMenuClient::customizeMenu, it's no longer used
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (191428 => 191429)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2015-10-22 02:27:15 UTC (rev 191429)
@@ -438,7 +438,7 @@
return nullptr;
}
-RefPtr<WebContextMenuProxy> WebView::createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&)
+std::unique_ptr<WebContextMenuProxy> WebView::createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&)
{
notImplemented();
return nullptr;
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (191428 => 191429)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-10-22 02:27:15 UTC (rev 191429)
@@ -180,7 +180,7 @@
#endif
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
+ virtual std::unique_ptr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp (191428 => 191429)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp 2015-10-22 02:27:15 UTC (rev 191429)
@@ -50,6 +50,11 @@
{
}
+void WebContextMenuProxyEfl::show()
+{
+ showContextMenu();
+}
+
void WebContextMenuProxyEfl::showContextMenu()
{
Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h (191428 => 191429)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h 2015-10-22 02:27:15 UTC (rev 191429)
@@ -41,20 +41,17 @@
class WebContextMenuProxyEfl : public WebContextMenuProxy {
public:
- static Ref<WebContextMenuProxyEfl> create(EwkView* viewImpl, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
- {
- return adoptRef(*new WebContextMenuProxyEfl(viewImpl, page, context, userData));
- }
-
+ WebContextMenuProxyEfl(EwkView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
~WebContextMenuProxyEfl();
- virtual void showContextMenu() override;
- virtual void hideContextMenu() override;
- virtual void cancelTracking() override;
-
private:
- WebContextMenuProxyEfl(EwkView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
+ virtual void show() override;
+ void showContextMenu();
+ void hideContextMenu();
+ void cancelTracking();
+
+
EwkView* m_ewkView;
WebPageProxy& m_page;
};
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp (191428 => 191429)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2015-10-22 02:27:15 UTC (rev 191429)
@@ -94,9 +94,9 @@
}
#if ENABLE(CONTEXT_MENUS)
-RefPtr<WebContextMenuProxy> WebViewEfl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
+std::unique_ptr<WebContextMenuProxy> WebViewEfl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
{
- return WebContextMenuProxyEfl::create(m_ewkView, page, context, userData);
+ return std::make_unique<WebContextMenuProxyEfl>(m_ewkView, page, context, userData);
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h (191428 => 191429)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2015-10-22 02:27:15 UTC (rev 191429)
@@ -71,7 +71,7 @@
void handleDownloadRequest(DownloadProxy*) override;
#if ENABLE(CONTEXT_MENUS)
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
+ virtual std::unique_ptr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
#endif
#if ENABLE(FULLSCREEN_API)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (191428 => 191429)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-10-22 02:27:15 UTC (rev 191429)
@@ -49,7 +49,12 @@
delete this;
}
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
+#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
+std::unique_ptr<ContextMenu> WebContextMenuClient::customizeMenu(std::unique_ptr<ContextMenu>)
+{
+ return nullptr;
+}
+#else
PlatformMenuDescription WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* menu)
{
// WebKit2 ignores this client callback and does context menu customization when it is told to show the menu.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h (191428 => 191429)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-10-22 02:18:42 UTC (rev 191428)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-10-22 02:27:15 UTC (rev 191429)
@@ -43,8 +43,10 @@
private:
virtual void contextMenuDestroyed() override;
-
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
+
+#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
+ virtual std::unique_ptr<WebCore::ContextMenu> customizeMenu(std::unique_ptr<WebCore::ContextMenu>) override;
+#else
virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*) override;
#endif
virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) override;
