external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge WebKit at r84325: Initial merge by git.	Ben Murdoch	2011-06-10	4	-20/+48
\| \| \| \|	Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
*	Merge WebKit at r82507: Initial merge by git	Steve Block	2011-06-08	2	-6/+11
\| \| \| \|	Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
*	Merge WebKit at r80534: Intial merge by Git	Ben Murdoch	2011-06-02	6	-15/+18
\| \| \| \|	Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
*	Merge WebKit at r78450: Fix remaining conflicts	Steve Block	2011-05-25	2	-11/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Document.cpp Conflict due to AX object cache disabled on Android See http://trac.webkit.org/changeset/78314 - CachedResourceLoader.cpp/h Conflict due to ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/76701 - Source/WebCore/page/ChromeClient.h Conflict due to ANDROID_INSTALLABLE_WEB_APPS See http://trac.webkit.org/changeset/77509 - FrameView.cpp Conflict due to Android FrameView::updatePositionedObjects() See http://trac.webkit.org/changeset/77274 - ScrollView.h Conflict due to Android ScrollView::actualWidth/Height/ScrollX/ScrollY() See http://trac.webkit.org/changeset/76831 - TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp conflict due to Android stubbed out MIMETypeRegistry::getMIMETypeForExtension() See http://trac.webkit.org/changeset/77368 and https://android-git.corp.google.com/g/#change,37272 - ImageDecoder.cpp Conflict due to Android excluding code See http://trac.webkit.org/changeset/77427 - ImageDecoder.h Conflict due to ANDROID guard upstreamed as SKIA guard See http://trac.webkit.org/changeset/77946 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/76743 and http://trac.webkit.org/changeset/77286 - RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT See http://trac.webkit.org/changeset/77062 Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
*	Merge WebKit at r78450: Initial merge by git.	Steve Block	2011-05-24	12	-160/+155
\| \| \| \|	Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
*	Merge WebKit at r76408: Initial merge by git.	Ben Murdoch	2011-05-23	1	-1/+2
\| \| \| \|	Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
*	Merge WebKit at r75993: Initial merge by git.	Ben Murdoch	2011-05-16	25	-134/+134
\| \| \| \|	Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
*	Merge WebKit at r75315: Initial merge by git.	Steve Block	2011-05-12	25	-0/+6084
	Change-Id: I570314b346ce101c935ed22a626b48c2af266b84