summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/platform')
-rw-r--r--Source/WebCore/platform/GeolocationService.h5
-rw-r--r--Source/WebCore/platform/android/PlatformBridge.h4
-rw-r--r--Source/WebCore/platform/mock/GeolocationServiceMock.cpp5
-rwxr-xr-xSource/WebCore/platform/mock/GeolocationServiceMock.h5
4 files changed, 0 insertions, 19 deletions
diff --git a/Source/WebCore/platform/GeolocationService.h b/Source/WebCore/platform/GeolocationService.h
index 27be6c3..1045bb3 100644
--- a/Source/WebCore/platform/GeolocationService.h
+++ b/Source/WebCore/platform/GeolocationService.h
@@ -48,12 +48,7 @@ public:
static GeolocationService* create(GeolocationServiceClient*);
virtual ~GeolocationService() { }
-#if PLATFORM(ANDROID)
- // TODO: Upstream to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=34082
- virtual bool startUpdating(PositionOptions*, bool suspend) { return false; }
-#else
virtual bool startUpdating(PositionOptions*) { return false; }
-#endif
virtual void stopUpdating() { }
virtual void suspend() { }
diff --git a/Source/WebCore/platform/android/PlatformBridge.h b/Source/WebCore/platform/android/PlatformBridge.h
index a4c1048..e48e50c 100644
--- a/Source/WebCore/platform/android/PlatformBridge.h
+++ b/Source/WebCore/platform/android/PlatformBridge.h
@@ -124,10 +124,6 @@ public:
};
static String* globalLocalizedName(rawResId resId);
- // Whether the WebView is paused.
- // ANDROID
- // TODO: Upstream to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=34082
- static bool isWebViewPaused(const FrameView*);
static String resolveFilePathForContentUri(const String&);
static int screenDepth();
diff --git a/Source/WebCore/platform/mock/GeolocationServiceMock.cpp b/Source/WebCore/platform/mock/GeolocationServiceMock.cpp
index c3ba7b4..b254cb8 100644
--- a/Source/WebCore/platform/mock/GeolocationServiceMock.cpp
+++ b/Source/WebCore/platform/mock/GeolocationServiceMock.cpp
@@ -80,12 +80,7 @@ void GeolocationServiceMock::setError(PassRefPtr<PositionError> error)
makeGeolocationCallbackFromAllInstances();
}
-#if PLATFORM(ANDROID)
-// TODO: Upstream to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=34082
-bool GeolocationServiceMock::startUpdating(PositionOptions*, bool /* suspend */)
-#else
bool GeolocationServiceMock::startUpdating(PositionOptions*)
-#endif
{
m_isActive = true;
m_timer.startOneShot(0);
diff --git a/Source/WebCore/platform/mock/GeolocationServiceMock.h b/Source/WebCore/platform/mock/GeolocationServiceMock.h
index 1b4db93..7d02797 100755
--- a/Source/WebCore/platform/mock/GeolocationServiceMock.h
+++ b/Source/WebCore/platform/mock/GeolocationServiceMock.h
@@ -46,12 +46,7 @@ class GeolocationServiceMock : public GeolocationService {
GeolocationServiceMock(GeolocationServiceClient*);
virtual ~GeolocationServiceMock();
-#if PLATFORM(ANDROID)
- // TODO: Upstream to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=34082
- virtual bool startUpdating(PositionOptions*, bool suspend);
-#else
virtual bool startUpdating(PositionOptions*);
-#endif
virtual void stopUpdating();
static void setPosition(PassRefPtr<Geoposition> position);