From bad9d7e7c4e6287433126b2faeb697fc690e7d9b Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 16 Sep 2010 12:46:38 +0100 Subject: 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 --- .../fast/dom/Geolocation/ongoing-request-leak-expected.txt | 1 - LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html | 13 ------------- .../dom/Geolocation/script-tests/ongoing-request-leak.js | 13 ------------- 3 files changed, 27 deletions(-) delete mode 100644 LayoutTests/fast/dom/Geolocation/ongoing-request-leak-expected.txt delete mode 100644 LayoutTests/fast/dom/Geolocation/ongoing-request-leak.html delete mode 100644 LayoutTests/fast/dom/Geolocation/script-tests/ongoing-request-leak.js (limited to 'LayoutTests/fast') 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 @@ - - - - - - - -

- - - - 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.