external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge WebKit at r84325: Initial merge by git.	Ben Murdoch	2011-06-10	1	-1/+1
\| \| \| \|	Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
*	Merge WebKit at r82507: Initial merge by git	Steve Block	2011-06-08	1	-1/+39
\| \| \| \|	Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
*	Merge WebKit at r80534: Intial merge by Git	Ben Murdoch	2011-06-02	1	-3/+4
\| \| \| \|	Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
*	Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard	Steve Block	2011-05-25	1	-21/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|	This replaces, and therefore conflicts with, Android's existing ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the upstream guard in WebCore, updates WebKit to use the new guard, and enables this guard on Android. See http://trac.webkit.org/changeset/78439 See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
*	Merge WebKit at r78450: Initial merge by git.	Steve Block	2011-05-24	1	-19/+45
\| \| \| \|	Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
*	Remove some superfluous ARCHIVE enable guards	Steve Block	2011-05-19	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \|	A new WEB_ARCHIVE enable guard will be added upstream in http://trac.webkit.org/changeset/78439, replacing our downstream ARCHIVE guard. This patch removes a couple of instances of the downstream guard that are not required and hence will not be replaced by the upstream guard. Change-Id: Ibc8ca754617e8b34fd8563f6f3b9fa671e871f23
*	Merge WebKit at r75315: Initial merge by git.	Steve Block	2011-05-12	1	-0/+840
	Change-Id: I570314b346ce101c935ed22a626b48c2af266b84