external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge webkit.org at r54731 : Fix merge conflicts due to frame flattening	Steve Block	2010-02-16	1	-3/+0
\| \| \| \| \| \| \| \| \|	Common frame flattening code was added upstream in http://trac.webkit.org/changeset/54440 We take this code, but also keep the current Android-specific implementation. Currently, the common code is disabled and we continue to use the Android version. The two will be combined at a later date. Change-Id: I194c7028b84a05d85040ca6199802c42a520be96
*	Merge webkit.org at r54731 : Initial merge by git	Steve Block	2010-02-16	1	-0/+55
\| \| \| \|	Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
*	Makes a number of changes to ease future merging with and upstreaming to ↵	Steve Block	2009-10-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|	webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
*	Get WebKit r44544.	Feng Qian	2009-06-17	1	-22/+22
\|
*	auto import from //depot/cupcake/@136594	The Android Open Source Project	2009-03-05	1	-4/+4
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+96
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-96/+0
\|
*	Initial Contribution	The Android Open Source Project	2008-10-21	1	-0/+34
\|
*	external/webkit r30707	Upstream	1970-01-12	1	-0/+62