external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge WebKit at r67178 : Initial merge by git.	Iain Merrick	2010-09-16	1	-559/+0
\| \| \| \|	Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
*	Merge WebKit at r66666 : Initial merge by git.	Kristian Monsen	2010-09-11	1	-1/+2
\| \| \| \|	Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
*	Merge WebKit at r66079 : Initial merge by git	Steve Block	2010-09-02	1	-16/+9
\| \| \| \|	Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
*	Copy back the upstreamed version of prefetch	Leon Clarke	2010-07-12	1	-9/+7
\| \| \| \| \| \|	https://bugs.webkit.org/show_bug.cgi?id=3652 Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca
*	Merge WebKit at r60074: Initial merge by git	Steve Block	2010-05-27	1	-4/+11
\| \| \| \|	Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
*	Merge webkit.org at r58033 : Resolve merge conflicts	Steve Block	2010-05-11	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
*	Merge webkit.org at r58033 : Initial merge by git	Steve Block	2010-05-11	1	-2/+5
\| \| \| \|	Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
*	Link prefetch support	Leon Clarke	2010-05-04	1	-2/+24
\| \| \| \|	http://b/issue?id=2268353
*	Use the complete url when blocking images.	Patrick Scott	2010-03-04	1	-1/+1
\| \| \| \| \| \| \|	Image urls that are relative to a base url need to be resolved before looking at the scheme. Bug: 2455482
*	Merge webkit.org at r54127 : Initial merge by git	Steve Block	2010-02-04	1	-2/+8
\| \| \| \|	Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
*	Makes a number of changes to ease future merging with and upstreaming to ↵	Steve Block	2009-10-22	1	-0/+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
*	Merge webkit.org at R49305 : Update KURL constructor call sites to new ↵	Steve Block	2009-10-20	1	-1/+1
\| \| \| \| \| \| \| \|	signature. See http://trac.webkit.org/changeset/47907 Change-Id: I0d2f17fb161254e62e835d52fe7ab482b11b054d
*	Merge webkit.org at R49305 : Automatic merge by git.	Steve Block	2009-10-20	1	-1/+36
\| \| \| \|	Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
*	Merge in WebKit r47029.	Ben Murdoch	2009-08-11	1	-1/+1
\|
*	Get WebKit r44544.	Feng Qian	2009-06-17	1	-2/+13
\|
*	AI 145796: Land the WebKit merge @r42026.	Feng Qian	2009-04-10	1	-0/+9
\| \| \| \|	Automated import of CL 145796
*	auto import from //depot/cupcake/@136594	The Android Open Source Project	2009-03-05	1	-37/+44
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+468
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-468/+0
\|
*	Code drop from //branches/cupcake/...@124589	The Android Open Source Project	2008-12-17	1	-75/+122
\|
*	Initial Contribution	The Android Open Source Project	2008-10-21	1	-8/+182
\|
*	external/webkit r30707	Upstream	1970-01-12	1	-0/+247