external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge webkit.org at r61121: Initial merge by git.	Ben Murdoch	2010-06-16	1	-2/+2
\| \| \| \|	Change-Id: Icd6db395c62285be384d137164d95d7466c98760
*	Merge WebKit at r60074: Initial merge by git	Steve Block	2010-05-27	1	-2/+2
\| \| \| \|	Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
*	Merge webkit.org at r58033 : Move Android iframe-flattening code to ↵	Steve Block	2010-05-11	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RenderIFrame.cpp The Android iframe-flattening code was in RenderPartObject. The rendering classes have been refactored upstream in http://trac.webkit.org/changeset/57866 so that most of RenderPartObject was moved to RenderIFrame. RenderPartObject was then removed in http://trac.webkit.org/changeset/57900. Iframe-flattening was also added upstream in http://trac.webkit.org/changeset/56718. This change takes the Android iframe-flattening code from RenderPartObject and moves it to RenderIFrame. It also renames FLATTEN_IFRAME to ANDROID_FLATTEN_IFRAME and FLATTEN_FRAMESET to ANDROID_FLATTEN_FRAMESET for clarity. Change-Id: I1af8d042f8d0c4abd513f8a315ac681360c1cc53
*	Merge webkit.org at r58033 : Initial merge by git	Steve Block	2010-05-11	1	-1/+1
\| \| \| \|	Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
*	Merge webkit.org at r54731 : Initial merge by git	Steve Block	2010-02-16	1	-1/+121
\| \| \| \|	Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
*	Merge webkit.org at r51976 : Initial merge by git.	Steve Block	2009-12-17	1	-8/+8
\| \| \| \|	Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
*	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
*	Fixes a bunch of WebKit whitespace discrepancies between Android and ↵	Steve Block	2009-10-14	1	-1/+1
\| \| \| \| \| \| \| \|	webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
*	Merge in WebKit r47029.	Ben Murdoch	2009-08-11	1	-6/+7
\|
*	AI 145796: Land the WebKit merge @r42026.	Feng Qian	2009-04-10	1	-14/+9
\| \| \| \|	Automated import of CL 145796
*	auto import from //depot/cupcake/@136594	The Android Open Source Project	2009-03-05	1	-24/+27
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+771
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-771/+0
\|
*	Code drop from //branches/cupcake/...@124589	The Android Open Source Project	2008-12-17	1	-29/+9
\|
*	Initial Contribution	The Android Open Source Project	2008-10-21	1	-2/+121
\|
*	external/webkit r30707	Upstream	1970-01-12	1	-0/+672