diff options
| author | Steve Block <steveblock@google.com> | 2012-05-18 17:58:24 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-05-22 14:17:23 +0100 |
| commit | dbdd2da378a2c3d2baf2524694cb6e25419f8818 (patch) | |
| tree | 69dac14113149a28575d9d323ba1b9061519a32b /Source/WebCore/Android.mk | |
| parent | b80d1c52ad334f34843b52138f0ea684f2683904 (diff) | |
| download | external_webkit-dbdd2da378a2c3d2baf2524694cb6e25419f8818.zip external_webkit-dbdd2da378a2c3d2baf2524694cb6e25419f8818.tar.gz external_webkit-dbdd2da378a2c3d2baf2524694cb6e25419f8818.tar.bz2 | |
Hook up client-based Geolocation mock
This simply involves updating GeolocationMock, which is called by DRT from
Java, to call the GeolocationClientMock via GeolocationManager, rather than the
old GeolocationServiceMock. Note that GeolocationClientMock is tied to a
specific page, whereas GeolocationServiceMock had static methods, so we need to
pass the WebViewCore from Java.
We can now safely exclude the non-client-based files from the build.
We pass all Geolocation LayoutTests, except for
permission-denied-already-[error|success].html, which are flaky due to
https://bugs.webkit.org/show_bug.cgi?id=87033.
See corresponding framework change I6d88d5dce5c2148812b191a5b452718bf0854aeb.
Bug: 6511338
Change-Id: Ib74a3c05991593e75c3138415d4ac0bf0c9aefa9
Diffstat (limited to 'Source/WebCore/Android.mk')
| -rw-r--r-- | Source/WebCore/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index 6457835..f4f9bca 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -546,7 +546,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/FileChooser.cpp \ platform/FileStream.cpp \ platform/FileSystem.cpp \ - platform/GeolocationService.cpp \ platform/KURL.cpp \ platform/KURLGoogle.cpp \ platform/KillRingNone.cpp \ @@ -756,7 +755,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ platform/mock/DeviceOrientationClientMock.cpp \ platform/mock/GeolocationClientMock.cpp \ - platform/mock/GeolocationServiceMock.cpp \ platform/mock/SpeechInputClientMock.cpp \ \ platform/network/AuthenticationChallengeBase.cpp \ |