summaryrefslogtreecommitdiffstats
path: root/WebCore/page/GeolocationController.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-123/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101-0/+12
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-2/+2
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-8/+18
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-1/+4
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-1/+6
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge webkit.org at r54127 : Resolve Geolocation conflicts.Steve Block2010-02-041-26/+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/+33
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 53441 to make changes to GeolocationSteve Block2010-01-251-1/+2
| | | | | | | | 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
* Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-181-0/+85
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