Title: [97871] trunk/Source/WebKit/gtk
- Revision
- 97871
- Author
- [email protected]
- Date
- 2011-10-19 11:54:51 -0700 (Wed, 19 Oct 2011)
Log Message
[Gtk][Geolocation] Build guards missing in geolocation clients
https://bugs.webkit.org/show_bug.cgi?id=70420
Patch by Zan Dobersek <[email protected]> on 2011-10-19
Reviewed by Gustavo Noronha Silva.
Adds build guards that were forgotten when client-based
geolocation was introduced in r97746. This should make builds
without geolocation support succeed again.
* WebCoreSupport/GeolocationClientGtk.cpp:
* WebCoreSupport/GeolocationClientGtk.h:
* webkit/webkitwebview.cpp:
(webkit_web_view_init):
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (97870 => 97871)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-10-19 17:44:44 UTC (rev 97870)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-10-19 18:54:51 UTC (rev 97871)
@@ -1,3 +1,19 @@
+2011-10-19 Zan Dobersek <[email protected]>
+
+ [Gtk][Geolocation] Build guards missing in geolocation clients
+ https://bugs.webkit.org/show_bug.cgi?id=70420
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Adds build guards that were forgotten when client-based
+ geolocation was introduced in r97746. This should make builds
+ without geolocation support succeed again.
+
+ * WebCoreSupport/GeolocationClientGtk.cpp:
+ * WebCoreSupport/GeolocationClientGtk.h:
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_init):
+
2011-10-18 Zan Dobersek <[email protected]>
[Gtk] Support for client-based geolocation
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.cpp (97870 => 97871)
--- trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.cpp 2011-10-19 17:44:44 UTC (rev 97870)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.cpp 2011-10-19 18:54:51 UTC (rev 97871)
@@ -21,6 +21,8 @@
#include "config.h"
#include "GeolocationClientGtk.h"
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+
#include "Chrome.h"
#include "Geolocation.h"
#include "GeolocationController.h"
@@ -174,3 +176,5 @@
}
}
+
+#endif // ENABLE(CLIENT_BASED_GEOLOCATION)
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h (97870 => 97871)
--- trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h 2011-10-19 17:44:44 UTC (rev 97870)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h 2011-10-19 18:54:51 UTC (rev 97871)
@@ -21,6 +21,8 @@
#ifndef GeolocationClientGtk_h
#define GeolocationClientGtk_h
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+
#include "GRefPtr.h"
#include "GeolocationClient.h"
#include "GeolocationPosition.h"
@@ -75,4 +77,6 @@
};
} // namespace WebKit
+#endif // ENABLE(CLIENT_BASED_GEOLOCATION)
+
#endif // GeolocationClientGtk_h
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (97870 => 97871)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2011-10-19 17:44:44 UTC (rev 97870)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2011-10-19 18:54:51 UTC (rev 97871)
@@ -3317,15 +3317,19 @@
pageClients.deviceOrientationClient = static_cast<WebCore::DeviceOrientationClient*>(new DeviceOrientationClientGtk);
#endif
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled())
pageClients.geolocationClient = new GeolocationClientMock;
else
pageClients.geolocationClient = new WebKit::GeolocationClient(webView);
+#endif
priv->corePage = new Page(pageClients);
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled())
static_cast<GeolocationClientMock*>(pageClients.geolocationClient)->setController(priv->corePage->geolocationController());
+#endif
// Pages within a same session need to be linked together otherwise some functionalities such
// as visited link coloration (across pages) and changing popup window location will not work.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
