diff options
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; } |