Title: [100782] trunk/Source/WebCore
- Revision
- 100782
- Author
- par...@webkit.org
- Date
- 2011-11-18 08:57:16 -0800 (Fri, 18 Nov 2011)
Log Message
Unreviewed build fix; r100686 broke the EFL build when Geolocation
support is enabled.
Patch by Raphael Kubo da Costa <k...@profusion.mobi> on 2011-11-18
* platform/efl/GeolocationServiceEfl.cpp: Only declare
s_factoryFunction if CLIENT_BASED_GEOLOCATION is off, otherwise it is
also declared in GeolocationService.cpp.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100781 => 100782)
--- trunk/Source/WebCore/ChangeLog 2011-11-18 16:43:45 UTC (rev 100781)
+++ trunk/Source/WebCore/ChangeLog 2011-11-18 16:57:16 UTC (rev 100782)
@@ -1,3 +1,12 @@
+2011-11-18 Raphael Kubo da Costa <k...@profusion.mobi>
+
+ Unreviewed build fix; r100686 broke the EFL build when Geolocation
+ support is enabled.
+
+ * platform/efl/GeolocationServiceEfl.cpp: Only declare
+ s_factoryFunction if CLIENT_BASED_GEOLOCATION is off, otherwise it is
+ also declared in GeolocationService.cpp.
+
2011-11-18 Igor Oliveira <igor.olive...@openbossa.org>
[TextureMapper] computePerspectiveTransformIfNeeded is called twice in TextureMapperNode::syncCompositingState
Modified: trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.cpp (100781 => 100782)
--- trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.cpp 2011-11-18 16:43:45 UTC (rev 100781)
+++ trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.cpp 2011-11-18 16:57:16 UTC (rev 100782)
@@ -28,7 +28,9 @@
namespace WebCore {
+#if !ENABLE(CLIENT_BASED_GEOLOCATION)
GeolocationService::FactoryFunction* GeolocationService::s_factoryFunction = &GeolocationServiceEfl::create;
+#endif
PassOwnPtr<GeolocationService> GeolocationServiceEfl::create(GeolocationServiceClient* client)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
