- Revision
- 160432
- Author
- [email protected]
- Date
- 2013-12-11 08:10:15 -0800 (Wed, 11 Dec 2013)
Log Message
Source/WebCore: [EFL] Fix build with CONTEXT_MENUS flag set OFF
https://bugs.webkit.org/show_bug.cgi?id=125572
Reviewed by Gyuyoung Kim.
dispatchEventAsContextMenuEvent is called regardless of CONTEXT_MENUS flag setting,
thus its definition in InspectorFrontendHost should not be guarded by this flag.
No new tests, no behaviour change.
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::dispatchEventAsContextMenuEvent):
Source/WebKit2: [EFL] Fix build with CONTEXT_MENUS flag set OFF
https:///bugs.webkit.org/show_bug.cgi?id=125572
Reviewed by Gyuyoung Kim.
Fix EFL build by adding necessary guard, also UNUSED_PARAM macros where added.
* Shared/API/c/WKContextMenuItem.cpp: Added UNUSED_PARAM macros.
(WKContextMenuItemCreateAsAction):
(WKContextMenuItemCreateAsCheckableAction):
(WKContextMenuItemCreateAsSubmenu):
(WKContextMenuItemGetTag):
(WKContextMenuItemGetType):
(WKContextMenuItemCopyTitle):
(WKContextMenuItemGetEnabled):
(WKContextMenuItemGetChecked):
(WKContextMenuCopySubmenuItems):
(WKContextMenuItemGetUserData):
(WKContextMenuItemSetUserData):
* UIProcess/API/C/WKPage.cpp: Ditto.
(WKPageSetPageContextMenuClient):
(WKPageSelectContextMenuItem):
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: Ditto.
(WKBundlePageSetContextMenuClient):
(WKBundlePageClickMenuItem):
(WKBundlePageCopyContextMenuItems):
(WKBundlePageCopyContextMenuAtPointInWindow)
* UIProcess/efl/WebViewEfl.cpp: Guard createContextMenuProxy method.
* UIProcess/efl/WebViewEfl.h: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160431 => 160432)
--- trunk/Source/WebCore/ChangeLog 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebCore/ChangeLog 2013-12-11 16:10:15 UTC (rev 160432)
@@ -1,3 +1,18 @@
+2013-12-11 Michał Pakuła vel Rutka <[email protected]>
+
+ [EFL] Fix build with CONTEXT_MENUS flag set OFF
+ https://bugs.webkit.org/show_bug.cgi?id=125572
+
+ Reviewed by Gyuyoung Kim.
+
+ dispatchEventAsContextMenuEvent is called regardless of CONTEXT_MENUS flag setting,
+ thus its definition in InspectorFrontendHost should not be guarded by this flag.
+
+ No new tests, no behaviour change.
+
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::dispatchEventAsContextMenuEvent):
+
2013-12-11 Tamas Gergely <[email protected]>
[CURL] Build fails after r160386.
Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (160431 => 160432)
--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-12-11 16:10:15 UTC (rev 160432)
@@ -281,10 +281,11 @@
m_frontendPage->contextMenuController().showContextMenu(event, menuProvider);
m_menuProvider = menuProvider.get();
}
+#endif
void InspectorFrontendHost::dispatchEventAsContextMenuEvent(Event* event)
{
-#if USE(ACCESSIBILITY_CONTEXT_MENUS)
+#if ENABLE(CONTEXT_MENUS) && USE(ACCESSIBILITY_CONTEXT_MENUS)
if (!event || !event->isMouseEvent())
return;
@@ -297,7 +298,6 @@
UNUSED_PARAM(event);
#endif
}
-#endif
String InspectorFrontendHost::loadResourceSynchronously(const String& url)
{
Modified: trunk/Source/WebKit2/ChangeLog (160431 => 160432)
--- trunk/Source/WebKit2/ChangeLog 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-11 16:10:15 UTC (rev 160432)
@@ -1,3 +1,35 @@
+2013-12-11 Michał Pakuła vel Rutka <[email protected]>
+
+ [EFL] Fix build with CONTEXT_MENUS flag set OFF
+ https:///bugs.webkit.org/show_bug.cgi?id=125572
+
+ Reviewed by Gyuyoung Kim.
+
+ Fix EFL build by adding necessary guard, also UNUSED_PARAM macros where added.
+
+ * Shared/API/c/WKContextMenuItem.cpp: Added UNUSED_PARAM macros.
+ (WKContextMenuItemCreateAsAction):
+ (WKContextMenuItemCreateAsCheckableAction):
+ (WKContextMenuItemCreateAsSubmenu):
+ (WKContextMenuItemGetTag):
+ (WKContextMenuItemGetType):
+ (WKContextMenuItemCopyTitle):
+ (WKContextMenuItemGetEnabled):
+ (WKContextMenuItemGetChecked):
+ (WKContextMenuCopySubmenuItems):
+ (WKContextMenuItemGetUserData):
+ (WKContextMenuItemSetUserData):
+ * UIProcess/API/C/WKPage.cpp: Ditto.
+ (WKPageSetPageContextMenuClient):
+ (WKPageSelectContextMenuItem):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: Ditto.
+ (WKBundlePageSetContextMenuClient):
+ (WKBundlePageClickMenuItem):
+ (WKBundlePageCopyContextMenuItems):
+ (WKBundlePageCopyContextMenuAtPointInWindow)
+ * UIProcess/efl/WebViewEfl.cpp: Guard createContextMenuProxy method.
+ * UIProcess/efl/WebViewEfl.h: Ditto.
+
2013-12-11 Kwang Yul Seo <[email protected]>
[WK2][Soup] Implement NetworkProcess::allowSpecificHTTPSCertificateForHost
Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp (160431 => 160432)
--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2013-12-11 16:10:15 UTC (rev 160432)
@@ -53,6 +53,9 @@
#if ENABLE(CONTEXT_MENUS)
return toAPI(WebContextMenuItem::create(WebContextMenuItemData(ActionType, toImpl(tag), toImpl(title)->string(), enabled, false)).leakRef());
#else
+ UNUSED_PARAM(tag);
+ UNUSED_PARAM(title);
+ UNUSED_PARAM(enabled);
return 0;
#endif
}
@@ -62,6 +65,10 @@
#if ENABLE(CONTEXT_MENUS)
return toAPI(WebContextMenuItem::create(WebContextMenuItemData(CheckableActionType, toImpl(tag), toImpl(title)->string(), enabled, checked)).leakRef());
#else
+ UNUSED_PARAM(tag);
+ UNUSED_PARAM(title);
+ UNUSED_PARAM(enabled);
+ UNUSED_PARAM(checked);
return 0;
#endif
}
@@ -71,6 +78,9 @@
#if ENABLE(CONTEXT_MENUS)
return toAPI(WebContextMenuItem::create(toImpl(title)->string(), enabled, toImpl(submenuItems)).leakRef());
#else
+ UNUSED_PARAM(title);
+ UNUSED_PARAM(enabled);
+ UNUSED_PARAM(submenuItems);
return 0;
#endif
}
@@ -117,6 +127,7 @@
return toAPI(toImpl(itemRef)->data()->action());
#endif
#else
+ UNUSED_PARAM(itemRef);
return toAPI(ContextMenuItemTagNoAction);
#endif
}
@@ -126,6 +137,7 @@
#if ENABLE(CONTEXT_MENUS)
return toAPI(toImpl(itemRef)->data()->type());
#else
+ UNUSED_PARAM(itemRef);
return toAPI(ActionType);
#endif
}
@@ -135,6 +147,7 @@
#if ENABLE(CONTEXT_MENUS)
return toCopiedAPI(toImpl(itemRef)->data()->title().impl());
#else
+ UNUSED_PARAM(itemRef);
return 0;
#endif
}
@@ -144,6 +157,7 @@
#if ENABLE(CONTEXT_MENUS)
return toImpl(itemRef)->data()->enabled();
#else
+ UNUSED_PARAM(itemRef);
return false;
#endif
}
@@ -153,6 +167,7 @@
#if ENABLE(CONTEXT_MENUS)
return toImpl(itemRef)->data()->checked();
#else
+ UNUSED_PARAM(itemRef);
return false;
#endif
}
@@ -162,6 +177,7 @@
#if ENABLE(CONTEXT_MENUS)
return toAPI(toImpl(itemRef)->submenuItemsAsAPIArray().leakRef());
#else
+ UNUSED_PARAM(itemRef);
return 0;
#endif
}
@@ -171,6 +187,7 @@
#if ENABLE(CONTEXT_MENUS)
return toAPI(toImpl(itemRef)->userData());
#else
+ UNUSED_PARAM(itemRef);
return 0;
#endif
}
@@ -179,5 +196,8 @@
{
#if ENABLE(CONTEXT_MENUS)
toImpl(itemRef)->setUserData(toImpl(userDataRef));
+#else
+ UNUSED_PARAM(itemRef);
+ UNUSED_PARAM(userDataRef);
#endif
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (160431 => 160432)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-11 16:10:15 UTC (rev 160432)
@@ -643,6 +643,9 @@
{
#if ENABLE(CONTEXT_MENUS)
toImpl(pageRef)->initializeContextMenuClient(wkClient);
+#else
+ UNUSED_PARAM(pageRef);
+ UNUSED_PARAM(wkClient);
#endif
}
@@ -857,6 +860,9 @@
{
#if ENABLE(CONTEXT_MENUS)
toImpl(page)->contextMenuItemSelected(*(toImpl(item)->data()));
+#else
+ UNUSED_PARAM(page);
+ UNUSED_PARAM(item);
#endif
}
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp (160431 => 160432)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2013-12-11 16:10:15 UTC (rev 160432)
@@ -87,10 +87,12 @@
return WebPopupMenuListenerEfl::create(page);
}
+#if ENABLE(CONTEXT_MENUS)
PassRefPtr<WebContextMenuProxy> WebViewEfl::createContextMenuProxy(WebPageProxy* page)
{
return WebContextMenuProxyEfl::create(m_ewkView, page);
}
+#endif
void WebViewEfl::setCursor(const Cursor& cursor)
{
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h (160431 => 160432)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2013-12-11 16:10:15 UTC (rev 160432)
@@ -57,10 +57,13 @@
void setCursor(const WebCore::Cursor&) OVERRIDE;
PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) OVERRIDE;
- PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) OVERRIDE;
void updateTextInputState() OVERRIDE;
void handleDownloadRequest(DownloadProxy*) OVERRIDE;
+#if ENABLE(CONTEXT_MENUS)
+ PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) OVERRIDE;
+#endif
+
#if ENABLE(FULLSCREEN_API)
// WebFullScreenManagerProxyClient
virtual void closeFullScreenManager() OVERRIDE FINAL { }
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (160431 => 160432)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-11 15:42:16 UTC (rev 160431)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-11 16:10:15 UTC (rev 160432)
@@ -65,6 +65,9 @@
{
#if ENABLE(CONTEXT_MENUS)
toImpl(pageRef)->initializeInjectedBundleContextMenuClient(wkClient);
+#else
+ UNUSED_PARAM(pageRef);
+ UNUSED_PARAM(wkClient);
#endif
}
@@ -163,6 +166,9 @@
{
#if ENABLE(CONTEXT_MENUS)
toImpl(pageRef)->contextMenu()->itemSelected(*toImpl(item)->data());
+#else
+ UNUSED_PARAM(pageRef);
+ UNUSED_PARAM(item);
#endif
}
@@ -188,6 +194,7 @@
return toAPI(contextMenuItems(*contextMenu).leakRef());
#else
+ UNUSED_PARAM(pageRef);
return nullptr;
#endif
}
@@ -201,6 +208,8 @@
return toAPI(contextMenuItems(*contextMenu).leakRef());
#else
+ UNUSED_PARAM(pageRef);
+ UNUSED_PARAM(point);
return nullptr;
#endif
}
