| 5277f3a59aa76c1a40995a47261b9710c284f877 |
|
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Resolve Geolocation conflicts.
Keep ours for maximumAge code.
Take theirs for client-based Geolocation code.
Change-Id: I72baa0026b1cd1bec617843a992dfb6008ca774d
/external/webkit/WebCore/page/GeolocationPosition.h
|
| d0825bca7fe65beaee391d30da42e937db621564 |
|
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
/external/webkit/WebCore/page/GeolocationPosition.h
|
| 370b559b082915acb99b185ed8c8e317fc654db6 |
|
14-Jan-2010 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 52103 - Add a client based Geolocation provider
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
/external/webkit/WebCore/page/GeolocationPosition.h
|