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	-3/+2
\| \| \| \|	Change-Id: Icd6db395c62285be384d137164d95d7466c98760
*	Enable File Reader and blob.slice APIs.	Ben Murdoch	2010-06-02	1	-1/+6
\| \| \| \| \| \| \| \| \|	Notes: - the change to WebCore/html/FileStream.cpp is a cherry pick of http://trac.webkit.org/changeset/60325 - the change to WebCore/platform/posix/FileSystemPOSIX.cpp is a cherry pick of http://trac.webkit.org/changeset/60374 - this needs a corresponding frameworks/base change Change-Id: I05d1496e1e95adf1c6a61c6f07bbf62e9bc92820
*	Merge WebKit at r60074: Initial merge by git	Steve Block	2010-05-27	1	-0/+74
\| \| \| \|	Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
*	Add a method to the PlatformBridge to resolve the filename of a file	Ben Murdoch	2010-05-21	1	-0/+2
\| \| \| \| \| \| \| \| \|	given its representation as a content:// URI, and the associated JNI plumbing. Requires a frameworks/base change. Change-Id: I9b8b8bb3fbfa31c86f4212f91c140fe62c6c6682
*	Merge Webkit at r58956: Fix conflicts.	Ben Murdoch	2010-05-14	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
*	Merge Webkit at r58956: Initial merge by Git.	Ben Murdoch	2010-05-14	1	-0/+2
\| \| \| \|	Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
*	Cherry-pick WebKit change 59226 to use standard POSIX version of writeToFile()	Steve Block	2010-05-12	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \|	The Android version of writeToFile() tries to support interrupted writes, but has a bug as the data pointer is not updated. So instead we take the standard POSIX version. See https://mondrian.corp.google.com/changelist/75998-p9 and https://bugs.webkit.org/show_bug.cgi?id=38908 Change-Id: I011671211017005a06727e436f92e8458902a7db
*	Merge webkit.org at r58033 : Cherry-pick WebKit change 58774 to avoid ↵	Steve Block	2010-05-11	1	-0/+2
\| \| \| \| \| \| \| \|	conflicts with FileSystemPOSIX.cpp See http://trac.webkit.org/changeset/58774 Change-Id: I646d82752feaafaf0ece6e1cdd099ae2a200995e
*	Merge webkit.org at r58033 : Resolve merge conflicts	Steve Block	2010-05-11	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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/+71
\| \| \| \|	Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
*	Get WebKit r44544.	Feng Qian	2009-06-17	1	-1/+0
\|
*	auto import from //depot/cupcake/@136594	The Android Open Source Project	2009-03-05	1	-26/+5
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+193
\|
*	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-193/+0
\|
*	Code drop from //branches/cupcake/...@124589	The Android Open Source Project	2008-12-17	1	-0/+49
\|
*	external/webkit r30707	Upstream	1970-01-12	1	-0/+144