external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge webkit.org at r54127 : Resolve Geolocation conflicts.	Steve Block	2010-02-04	1	-3/+0
\| \| \| \| \| \| \|	Keep ours for maximumAge code. Take theirs for client-based Geolocation code. Change-Id: I72baa0026b1cd1bec617843a992dfb6008ca774d
*	Merge webkit.org at r54127 : Initial merge by git	Steve Block	2010-02-04	1	-0/+4
\| \| \| \|	Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
*	Cherry-pick WebKit change 52103 - Add a client based Geolocation provider	Steve Block	2010-01-18	1	-0/+110
	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