external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ↵	Steve Block	2010-02-04	1	-4/+0
\| \| \| \| \| \| \| \|	ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/52177 Change-Id: I0c9e64766c6d7c9479100fb5b313b4562c5e7e42
*	Merge webkit.org at r54127 : Initial merge by git	Steve Block	2010-02-04	1	-0/+5
\| \| \| \|	Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
*	Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.	Steve Block	2010-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
*	Merge in WebKit r47029.	Ben Murdoch	2009-08-11	1	-3/+1
\|
*	Get WebKit r44544.	Feng Qian	2009-06-17	1	-0/+3
\|
*	auto import from //depot/cupcake/@136594	The Android Open Source Project	2009-03-05	1	-9/+34
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+364
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-364/+0
\|
*	auto import from //branches/cupcake/...@132276	The Android Open Source Project	2009-02-19	1	-0/+4
\|
*	Code drop from //branches/cupcake/...@124589	The Android Open Source Project	2008-12-17	1	-38/+95
\|
*	Initial Contribution	The Android Open Source Project	2008-10-21	1	-0/+9
\|
*	external/webkit r30707	Upstream	1970-01-12	1	-0/+294