From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 7 May 2012 11:21:11 +0200
Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b
 (http://svn.webkit.org/repository/webkit/trunk@116286)

---
 Source/WebKit/win/WebGeolocationPosition.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'Source/WebKit/win/WebGeolocationPosition.cpp')

diff --git a/Source/WebKit/win/WebGeolocationPosition.cpp b/Source/WebKit/win/WebGeolocationPosition.cpp
index 26554ddf8..fb2ac6fa4 100644
--- a/Source/WebKit/win/WebGeolocationPosition.cpp
+++ b/Source/WebKit/win/WebGeolocationPosition.cpp
@@ -27,11 +27,9 @@
 #include "WebGeolocationPosition.h"
 #include <WebCore/COMPtr.h>
 
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
 #include <WebCore/GeolocationPosition.h>
 
 using namespace WebCore;
-#endif
 
 COMPtr<WebGeolocationPosition> WebGeolocationPosition::createInstance()
 {
@@ -83,15 +81,10 @@ ULONG WebGeolocationPosition::Release()
 
 HRESULT WebGeolocationPosition::initWithTimestamp(double timestamp, double latitude, double longitude, double accuracy)
 {
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
     m_position = GeolocationPosition::create(timestamp, latitude, longitude, accuracy);
     return S_OK;
-#else
-    return E_FAIL;
-#endif
 }
 
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
 GeolocationPosition* core(IWebGeolocationPosition* position)
 {
     if (!position)
@@ -103,4 +96,3 @@ GeolocationPosition* core(IWebGeolocationPosition* position)
 
     return webGeolocationPosition->impl();
 }
-#endif
-- 
cgit v1.2.1