Recovery timeout of geolocation to normal value from 10 times

[Title] Recovery timeout of geolocation to normal value from 10 times
[Issue#] N/A
[Problem] Currently, timeout value of geolocation is set to 10 times.
[Cause] N/A
[Solution] Remove the 10 times about timeout value

Change-Id: I92731261bef01eb8e65ce3f28e5359eaf27541b6

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 8a4fc27..3d7e798 100755 (executable)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -458,11 +458,6 @@
 /* Download Patches */
 #define ENABLE_TIZEN_DOWNLOAD 1 /* Keunsoon Lee(keunsoon.lee@samsung.com) : */
 
-/* Geolocation's patches */
-#if ENABLE(GEOLOCATION)
-#define ENABLE_TIZEN_GEOLOCATION_TIMEOUT_INCREASE 1 /* Gyuyoung Kim(gyuyoung.kim@samsung.com) : Need to increase timeout time because slp gps's connection needs to wait about 45 sec */
-#endif
-
 /* Plugin Patches */
 #define ENABLE_TIZEN_SUPPORT_PLUGINS 1 /* Mariusz Grzegorczyk(mariusz.g@samsung.com) : */
 #define ENABLE_TIZEN_PLUGIN_SHOW_MISSING_PLUGIN_STATEMENT_EVEN_IF_PLUGIN_IS_DISABLED_ON_PREFERENCE 1 /* Keunsoon Lee(keunsoon.lee@samsung.com): show "missing plugin" even if preference setting for plugin is disabled. */

diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp
index 0fe3487..57caf31 100644 (file)
--- a/Source/WebCore/Modules/geolocation/Geolocation.cpp
+++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp
@@ -137,11 +137,7 @@ void Geolocation::GeoNotifier::runErrorCallback(PositionError* error)
 void Geolocation::GeoNotifier::startTimerIfNeeded()
 {
     if (m_options->hasTimeout())
-#if ENABLE(TIZEN_GEOLOCATION_TIMEOUT_INCREASE)
-        m_timer.startOneShot(m_options->timeout() / 100.0);
-#else
         m_timer.startOneShot(m_options->timeout() / 1000.0);
-#endif
 }
 
 void Geolocation::GeoNotifier::stopTimer()