external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge webkit.org at r51976 : Fix general conflicts.	Steve Block	2009-12-17	1	-9/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
*	Merge webkit.org at r51976 : Initial merge by git.	Steve Block	2009-12-17	1	-72/+35
\| \| \| \|	Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
*	Merge webkit.org at r50258 : Initial merge by git.	Steve Block	2009-11-10	1	-39/+154
\| \| \| \|	Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
*	Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵	Steve Block	2009-10-27	1	-0/+6
\| \| \| \| \| \| \| \| \| \|	to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
*	Merge webkit.org at R49305 : Automatic merge by git.	Steve Block	2009-10-20	1	-6/+10
\| \| \| \|	Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
*	Merge in WebKit r47029.	Ben Murdoch	2009-08-11	1	-12/+24
\|
*	Get WebKit r44544.	Feng Qian	2009-06-17	1	-32/+17
\|
*	AI 145796: Land the WebKit merge @r42026.	Feng Qian	2009-04-10	1	-24/+29
\| \| \| \|	Automated import of CL 145796
*	auto import from //depot/cupcake/@136594	The Android Open Source Project	2009-03-05	1	-38/+51
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+376
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-376/+0
\|
*	Code drop from //branches/cupcake/...@124589	The Android Open Source Project	2008-12-17	1	-0/+376