Diff
Modified: trunk/Source/WebKit2/ChangeLog (110045 => 110046)
--- trunk/Source/WebKit2/ChangeLog 2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-07 12:04:01 UTC (rev 110046)
@@ -1,3 +1,25 @@
+2012-03-07 Andras Becsi <andras.be...@nokia.com>
+
+ [WK2] Make it possible to build without geolocation support
+ https://bugs.webkit.org/show_bug.cgi?id=80426
+
+ Reviewed by Simon Hausmann.
+
+ Add missing guards.
+
+ * UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
+ (WebKit::GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::processDidCrash):
+ * WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit):
+ * WebProcess/WebPage/WebPage.h:
+ (WebPage):
+ * WebProcess/WebPage/WebPage.messages.in:
+
2012-03-06 Raphael Kubo da Costa <k...@profusion.mobi>
[CMake] Make the removal of transitive library dependencies work with CMake < 2.8.7.
Modified: trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp (110045 => 110046)
--- trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2012-03-07 12:04:01 UTC (rev 110046)
@@ -63,7 +63,10 @@
if (it == m_pendingRequests.end())
return;
+#if ENABLE(GEOLOCATION)
m_page->process()->send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, allowed), m_page->pageID());
+#endif
+
m_pendingRequests.remove(it);
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (110045 => 110046)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-07 12:04:01 UTC (rev 110046)
@@ -374,7 +374,10 @@
m_openPanelResultListener = 0;
}
+#if ENABLE(GEOLOCATION)
m_geolocationPermissionRequestManager.invalidateRequests();
+#endif
+
m_notificationPermissionRequestManager.invalidateRequests();
m_toolTip = String();
@@ -3248,7 +3251,10 @@
m_openPanelResultListener = nullptr;
}
+#if ENABLE(GEOLOCATION)
m_geolocationPermissionRequestManager.invalidateRequests();
+#endif
+
m_notificationPermissionRequestManager.invalidateRequests();
m_toolTip = String();
Modified: trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp (110045 => 110046)
--- trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp 2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp 2012-03-07 12:04:01 UTC (rev 110046)
@@ -26,6 +26,8 @@
#include "config.h"
#include "GeolocationPermissionRequestManager.h"
+#if ENABLE(GEOLOCATION)
+
#include "WebCoreArgumentCoders.h"
#include "WebFrame.h"
#include "WebPage.h"
@@ -89,3 +91,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(GEOLOCATION)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (110045 => 110046)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-07 12:04:01 UTC (rev 110046)
@@ -199,7 +199,9 @@
#if PLATFORM(QT)
, m_tapHighlightController(this)
#endif
+#if ENABLE(GEOLOCATION)
, m_geolocationPermissionRequestManager(this)
+#endif
, m_pageID(pageID)
, m_canRunBeforeUnloadConfirmPanel(parameters.canRunBeforeUnloadConfirmPanel)
, m_canRunModal(parameters.canRunModal)
@@ -2254,10 +2256,12 @@
}
#endif
+#if ENABLE(GEOLOCATION)
void WebPage::didReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed)
{
m_geolocationPermissionRequestManager.didReceiveGeolocationPermissionDecision(geolocationID, allowed);
}
+#endif
void WebPage::didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
{
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (110045 => 110046)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-03-07 12:04:01 UTC (rev 110046)
@@ -324,7 +324,10 @@
TapHighlightController& tapHighlightController() { return m_tapHighlightController; }
#endif
+#if ENABLE(GEOLOCATION)
GeolocationPermissionRequestManager& geolocationPermissionRequestManager() { return m_geolocationPermissionRequestManager; }
+#endif
+
NotificationPermissionRequestManager* notificationPermissionRequestManager();
void pageDidScroll();
@@ -635,6 +638,7 @@
#endif
void didReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed);
+
void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed);
void advanceToNextMisspelling(bool startBeforeSelection);
@@ -745,9 +749,12 @@
RefPtr<WebPopupMenu> m_activePopupMenu;
RefPtr<WebContextMenu> m_contextMenu;
RefPtr<WebOpenPanelResultListener> m_activeOpenPanelResultListener;
- GeolocationPermissionRequestManager m_geolocationPermissionRequestManager;
RefPtr<NotificationPermissionRequestManager> m_notificationPermissionRequestManager;
+#if ENABLE(GEOLOCATION)
+ GeolocationPermissionRequestManager m_geolocationPermissionRequestManager;
+#endif
+
OwnPtr<WebCore::PrintContext> m_printContext;
#if PLATFORM(GTK)
RefPtr<WebPrintOperationGtk> m_printOperation;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (110045 => 110046)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-03-07 12:04:01 UTC (rev 110046)
@@ -179,9 +179,11 @@
SetSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled);
#endif
+#if ENABLE(GEOLOCATION)
# Geolocation
DidReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed)
-
+#endif
+
# Notification
DidReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
