summaryrefslogtreecommitdiffstats
path: root/WebCore/page/Geolocation.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-14/+4
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Fix conflicts.Iain Merrick2010-08-231-17/+0
| | | | | | | | | | Removing call to Geolocation::stop(), which was lost in the merge with http://trac.webkit.org/changeset/65416 We may still have memory leaks here. This is being tracked in https://bugs.webkit.org/show_bug.cgi?id=39288 Change-Id: I69b75bf07775536ac603a450dbde8c2935c4db16
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-39/+92
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-3/+4
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-6/+11
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Cherry-pick WebKit change r60069 to fix a leak in GeolocationSteve Block2010-06-091-0/+17
| | | | | | | | | | This change was made as a fix for Bug https://bugs.webkit.org/show_bug.cgi?id=39288 but was later rolled back in r60441 pending further discussion. We need this fix, so cherry-pick it to Android until https://bugs.webkit.org/show_bug.cgi?id=39288 is fixed properly. Change-Id: Ie5cc610b841798e42ec1232b4af7674ce425b2c4
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-9/+2
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-10/+8
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Update Android to reflect upstreamed code to avoid Geolocation leaksSteve Block2010-05-241-38/+10
| | | | | | | | | | This is a cherry-pick of WebKit change http://trac.webkit.org/changeset/60069 This releases references to JS callbacks in the page and allows the Frame and thus the Geolocation object to be cleaned up. This change allows us to remove the Android-specific code which achieved the same through an unload listener. Bug: 2169518 Change-Id: I1ed97d40d7f69ec94a58eaa21bfa4979737cc84d
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-0/+2
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Cherry-pick WebKit change 58061 to add ↵Steve Block2010-05-111-0/+16
| | | | | | | | Geolocation::suspend()/resume() back in See http://trac.webkit.org/changeset/58061 Change-Id: Ie7b4b4891391656a6cc25cd30b3913f0638a0302
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-88/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-18/+100
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Fixes the Mac buildSteve Block2010-03-171-0/+2
| | | | | | | | - JavaInstanceJSC.cpp - Adds ANDROID guards around some temporary logging - Geolocation.cpp - Adds ANDROID guards around changes waiting to be upstreamed - WebChromeClient.h / EmptyClients.h - Pulls the Mac part of a WebKit change for which only the Android part was cherry-picked in https://android-git.corp.google.com/g/#change,41747 Change-Id: Ide97cb6b05e78528fe4b9430466837dedaadc4cf
* Marks remaining Android-specific changes to Geolocation with ANDROIDSteve Block2010-03-111-0/+12
| | | | Change-Id: I23e2ef2ec23b340e0bfe8bbf0e71e2c675fda676
* Update Android to reflect final version submitted to webkit.org for ↵Steve Block2010-03-111-30/+27
| | | | | | | | Geolocation maximumAge See http://trac.webkit.org/changeset/55841 Change-Id: Ib504563b7be40b0ff794cdcc625b07f494bb6483
* When starting the Geolocation service, we need to make sure that we have a ↵Steve Block2010-03-091-1/+6
| | | | | | | valid FrameView before querying the Java side to determine whether the WebView is paused. Bug: 2501254 Change-Id: Ideb86ce4c35efb7bc7595c4205dc1e8d5c1cf106
* Adds a missing initializer for Geolocation maximumAgeSteve Block2010-02-241-0/+1
| | | | Change-Id: I7274d12baa4718280e8cc677583e5308c7917a56
* Removes repeated headers in Geolocation.cppSteve Block2010-02-241-8/+0
| | | | | | | These were erroneously added in a previous WebKit merge. See https://android-git.corp.google.com/g/#change,39242 Change-Id: I192911ec35d7447ae3933cf4903aacd2ab202a3a
* Cherry-pick WebKit change 55136 to add a means to cancel an ongoing ↵Steve Block2010-02-231-2/+6
| | | | | | | | | | | | | | Geolocation permission request This is part of the change required to fix a Geolocation permissions bug. See https://android-git.corp.google.com/g/#change,40601 Note that We take only the WebCore component of the change, but additional changes are required to ChromeClientAndroid. See http://trac.webkit.org/changeset/55136 Change-Id: Iff0eab3adc3e41876df7f114c0d50243d015664f
* Fixes a bug with the Geolocation suspend/resume behaviourSteve Block2010-02-181-0/+8
| | | | | | | | | | | | | PlatformBridge::isWebViewPaused needs to be an instance method, rather than a static. This fixes a bug where if the user switches browser windows while a page that uses Geolocation is still loading, the Geolocation service won't be started in the suspended state. Note that this is a temporary fix, as the upstreaming of the existing suspend/resume code will introduce a new approach, which will avoid this problem altogether. See https://android-git.corp.google.com/g/#change,38942 Change-Id: I3f07f8837b8a8c1c5e7e4f5112ab487188670c3a
* Merge webkit.org at r54127 : Resolve Geolocation conflicts.Steve Block2010-02-041-41/+0
| | | | | | | Keep ours for maximumAge code. Take theirs for client-based Geolocation code. Change-Id: I72baa0026b1cd1bec617843a992dfb6008ca774d
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-0/+49
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 54096 for client-based GeolocationSteve Block2010-02-011-3/+8
| | | | | | | | See http://trac.webkit.org/changeset/54096 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Ic4f06aa2cf4ef8655bd05cd30746d9548f7e0d33
* Cherry-pick WebKit change 54080 for client-based GeolocationSteve Block2010-02-011-1/+1
| | | | | | | | See http://trac.webkit.org/changeset/54080 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Id67cac441eeaa58268c0bfdc8306a047bc56fba9
* Cherry-pick WebKit change 54079 for client-based GeolocationSteve Block2010-02-011-5/+30
| | | | | | | | See http://trac.webkit.org/changeset/54079 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I46b8f439668768fa930c610d4b10c7e45cc1ca01
* Cherry-pick WebKit change 53708 for client-based GeolocationSteve Block2010-02-011-0/+3
| | | | | | | | See http://trac.webkit.org/changeset/53708 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I369d96f8af0fc060ca0c8a9c5a16c5cdf91bedd3
* Fix Geolocation to make use of the startUpdating helper methodSteve Block2010-01-291-1/+1
| | | | | | | | | This should have been done as part of the cherry-pick of WebKit change 52103 in https://android-git.corp.google.com/g/#change,37374 This is a syntactic change only, no functional change on Android. Change-Id: Ic49ac710cafbacd5ff90e92d84b3360a316a43dd
* Fixes Geolocation maximumAge implementation to work when requestPermission ↵Steve Block2010-01-261-33/+61
| | | | | | | | | | | | | | is synchronous Geolocation::requestPermission may be implemented synchronously or asynchronously. See https://bugs.webkit.org/show_bug.cgi?id=26993 The current implementation of maximumAge on Android requires that requestPermission is asynchronous. This change fixes the code to work with both synchronous and asynchronous implementations of requestPermission. This will allow the maximumAge code to be upstreamed to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=30676 Change-Id: If7115e5d34ec308c91a1873a6841731dc37c18bd
* Moves the Geolocation position cache out of the Geolocation object.Steve Block2010-01-251-163/+10
| | | | | | | | | | | | | | | The position cache is an implementation detail of the Geolocation object, but is being moved to its own file to keep files to a reasonable size. Also updates some names and fixes soem style. This will be upstreamed in https://bugs.webkit.org/show_bug.cgi?id=34084 The maximumAge code in the Geolocation object, which may make use of this caching, is being upstreamed in https://bugs.webkit.org/show_bug.cgi?id=30676 Change-Id: I083556de732bd7be240a75da5369117aabc50e33
* Cherry-pick WebKit change 53441 to make changes to GeolocationSteve Block2010-01-251-5/+5
| | | | | | | | See http://trac.webkit.org/changeset/53441 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Ib69ddd4d1b0944c861ac6c35412936ec1209cff0
* Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume ↵Steve Block2010-01-251-0/+4
| | | | | | | | public See http://trac.webkit.org/changeset/53342 Change-Id: Ib28c69a686d72ea4fb17b52b6476bfc5696b1db3
* Cherry-pick WebKit change 52104 to make changes to GeolocationSteve Block2010-01-251-1/+0
| | | | | | | | See http://trac.webkit.org/changeset/52104 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I342b9f6b6ef5a25fac37dd2187a67a834fb7e270
* Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-181-16/+132
| | | | | | | | This is required to ease the process of upstreaming the Geolocation maximumAge handling code. Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this. Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
* Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation ↵Steve Block2010-01-151-1/+0
| | | | | | | | | | | calls back with a position fix. This call was removed in https://android-git.corp.google.com/g/#change,21293 but inadvertantly added back in https://android-git.corp.google.com/g/#change,21677 See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=e0330ac957b8434cd2c9c7b5447aaa0faabe77ec This call is not present in webkit.org. Change-Id: I712b5d29871e8bda54340e510c2bd7bc411728ee
* Fixes a Geolocation bug with cached positions.Steve Block2009-12-171-8/+13
| | | | | | | | | | In the case where a watch request returns a cached position, we must clear the cached position to prevent it from being used repeatedly in the case where the watch timer later fires. Also cleans up some code and adds some comments. This will be upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=30676 Change-Id: I4968731453c3dfd34a8d3466fdaee91d4c4158be
* Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.Steve Block2009-12-171-1/+1
| | | | | | See http://trac.webkit.org/changeset/50605 Change-Id: Iaad2055f169f56b7d43e2e3195041f0796506092
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-16/+1
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-3/+20
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Fixes a Geolocation bug with cached positions.Steve Block2009-12-071-5/+12
| | | | | | | When a Geolocation watch calls back with a cached position, it could be cleared in the callback. This change makes sure the watch still exists after the callback before starting the Geolocation service. Change-Id: I9a5736f5ce78e1c4bb36659245ffb61b485c4018
* Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.Steve Block2009-12-031-3/+7
| | | | | | | | BUG: http://b/2297475 This will be upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32111 Change-Id: I70c3076b1a85c89bc4c587ea9fedaa84bd7b0575
* Fixes use of statics of non-built-in types in Geolocation.Steve Block2009-11-251-5/+7
| | | | | | The Mac build requires that only built-in types are used as statics. Change-Id: I69a3f063c5728d76a13f73b8b056187d5678e0ab
* Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.Steve Block2009-11-241-1/+1
| | | | | | Also fixes include problems in files in WebKit/android. Change-Id: I6d6312e9753eb2bbf0b61f20a6ef0eb56f990991
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-42/+0
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-0/+45
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Updates Geolocation to use a pair of maps to store watchers.Steve Block2009-10-281-32/+75
| | | | | | | | | | | | | | | This reflects a recent change submitted to webkit.org (see http://trac.webkit.org/changeset/50159). This came about in the course of upstreaming the logic to make sure the error callback is called when permissions have already been denied (see http://trac.webkit.org/changeset/50190). Also make some minor style and comment changes to reflect other recent submissions to webkit.org. This will avoid future merge conflicts. Change-Id: Iafca02403b781bc2119e6e762cb04df396ca8c11
* Change eventTypes to eventNames to fix the assert.Patrick Scott2009-10-261-1/+1
|
* Merge webkit.org at R49305 : Update Geolocation to use new EventListener ↵Steve Block2009-10-201-8/+17
| | | | | | | | methods. See http://trac.webkit.org/changeset/48402, http://trac.webkit.org/changeset/48701 and http://trac.webkit.org/changeset/48767 Change-Id: Id32d80c62f71c98c6677d7cbe11ee2ffbdaeeff1
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-119/+0
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-0/+119
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7