external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge webkit.org at r58033 : Move Android iframe-flattening code to ↵	Steve Block	2010-05-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 : Resolve merge conflicts	Steve Block	2010-05-11	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	-1/+6
\| \| \| \|	Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
*	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/+5
\| \| \| \|	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
*	Merge in WebKit r47029.	Ben Murdoch	2009-08-11	1	-15/+25
\|
*	AI 145796: Land the WebKit merge @r42026.	Feng Qian	2009-04-10	1	-3/+9
\| \| \| \|	Automated import of CL 145796
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+129
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-129/+0
\|
*	Code drop from //branches/cupcake/...@124589	The Android Open Source Project	2008-12-17	1	-4/+0
\|
*	Initial Contribution	The Android Open Source Project	2008-10-21	1	-0/+11
\|
*	external/webkit r30707	Upstream	1970-01-12	1	-0/+122