external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge WebKit at r75315: Initial merge by git.	Steve Block	2011-05-12	1	-43/+0
\| \| \| \|	Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
*	Update files in platform/android to match what was upstreamed in	Andrei Popescu	2009-11-25	1	-14/+4
\| \| \| \| \|	https://bugs.webkit.org/show_bug.cgi?id=31825 https://bugs.webkit.org/show_bug.cgi?id=31831
*	Fixes license headers for all Android-specific JavaScriptCore and WebCore ↵	Steve Block	2009-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	files not yet upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. - For most files, I've fixed the names of copyright holders in the license text to 'THE COPYRIGHT HOLDERS' and cleaned up formatting in the existing BSD-style license. - For Makefiles and the following files in WebCore/platform/graphics/android/, I've changed from an Apache 2.0 license to the BSD-style license. - WebCore/platform/graphics/android/BitmapAllocatorAndroid.cpp - WebCore/platform/graphics/android/BitmapAllocatorAndroid.h - WebCore/platform/graphics/android/SharedBufferStream.cpp - WebCore/platform/graphics/android/SharedBufferStream.h - For the following files, I've changed from an LGPL licese to the BSD-style license. - WebCore/platform/graphics/android/FontPlatformData.h - WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp - WebCore/plugins/android/PluginDataAndroid.cpp Change-Id: Ic4c3e5610afc58637b7a9b81b1d0d1f17f4f4cb1
*	cherry-pick 0f07938f7e51e7a7eb4239b8a30e64b68dac8c66 due to automerger snafu	Grace Kloba	2009-06-16	1	-0/+53