diff options
| author | Steve Block <steveblock@google.com> | 2010-09-16 12:46:38 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-16 14:02:57 +0100 |
| commit | bad9d7e7c4e6287433126b2faeb697fc690e7d9b (patch) | |
| tree | 4ca59fae94a3ccf4a06ea23d47f6d42ff5b03db9 | |
| parent | 40eb71e3fee56da352632d872c203389b30d956e (diff) | |
| download | external_webkit-bad9d7e7c4e6287433126b2faeb697fc690e7d9b.zip external_webkit-bad9d7e7c4e6287433126b2faeb697fc690e7d9b.tar.gz external_webkit-bad9d7e7c4e6287433126b2faeb697fc690e7d9b.tar.bz2 | |
Remove superfluous Geolocation::stop() method rogue LayoutTests
The stop() method and LayoutTests were added in
https://android-git.corp.google.com/g/#change,53849 which
cherry-picked a WebKit change to attempt to stop leaks. This change
has been rolled back in WebKit pending a better solution, but was
retained in Android as a temporary fix.
Later changes to Geolocation in WebKit have now fixed the underlying
problem and this has been confirmed on Android.
The temporary fix was mostly removed in the merge to WebKit r65615 in
https://android-git.corp.google.com/g/#change,62318 This patch simply
removes the superfluous stop() method and LayoutTests, which were
missed in the above patch.
Bug: 3001031
Change-Id: Id17117f285cb1a8fa600945cc6a87fc336709cab
5 files changed, 0 insertions, 35 deletions
diff --git a/LayoutTests/fast/dom/Geolocation/ongoing-request-leak-expected.txt b/LayoutTests/fast/dom/Geolocation/ongoing-request-leak-expected.txt deleted file mode 100644 index 3fb979f..0000000 --- a/LayoutTests/fast/dom/Geolocation/ongoing-request-leak-expected.txt +++ /dev/null @@ -1 +0,0 @@ -Exercises a condition where the DOMWindow may leak if Geolocation requests are ongoing when the page is navigated away or closed. Complete. diff --git a/LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html b/LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html deleted file mode 100644 index dab385e..0000000 --- a/LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> -<html> -<head> -<link rel="stylesheet" href="../../js/resources/js-test-style.css"> -<script src="../../js/resources/js-test-pre.js"></script> -</head> -<body> -<p id="description"></p> -<div id="console"></div> -<script src="script-tests/ongoing-request-leak.js"></script> -<script src="../../js/resources/js-test-post.js"></script> -</body> -</html> diff --git a/LayoutTests/fast/dom/Geolocation/script-tests/ongoing-request-leak.js b/LayoutTests/fast/dom/Geolocation/script-tests/ongoing-request-leak.js deleted file mode 100644 index 08e6b21..0000000 --- a/LayoutTests/fast/dom/Geolocation/script-tests/ongoing-request-leak.js +++ /dev/null @@ -1,13 +0,0 @@ -description("Exercises a condition where the DOMWindow may leak if Geolocation requests are ongoing when the page is navigated away or closed. The page should reoload."); - -if (window.layoutTestController) layoutTestController.setGeolocationPermission(true); -if (window.layoutTestController) layoutTestController.setMockGeolocationPosition(51.478, -0.166, 100.0); - -navigator.geolocation.watchPosition(function() {}, null); - -document.body.onload = function() { - location = "data:text/html,Exercises a condition where the DOMWindow may leak if Geolocation requests are ongoing when the page is navigated away or closed. Complete.<script>if (window.layoutTestController) layoutTestController.notifyDone();</" + "script>"; -} - -window.jsTestIsAsync = true; -window.successfullyParsed = true; diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 19eff4a..44e28fa 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -728,10 +728,6 @@ Geolocation::~Geolocation() {} void Geolocation::setIsAllowed(bool) {} -#if PLATFORM(ANDROID) -void Geolocation::stop() {} -#endif // PLATFORM(ANDROID) - } #endif // ENABLE(GEOLOCATION) diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index a4a0c5a..2b60922 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -68,10 +68,6 @@ public: void suspend(); void resume(); -#if PLATFORM(ANDROID) - void stop(); -#endif // PLATFORM(ANDROID) - void setIsAllowed(bool); Frame* frame() const { return m_frame; } |