external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge WebKit at r80534: Update uses of PLATFORM(SKIA).	Ben Murdoch	2011-06-02	1	-5/+1
\| \| \| \| \| \| \| \| \|	PLATFORM(SKIA) is replaced with USE(SKIA), see http://trac.webkit.org/changeset/79578 Fix conflicts and update our code to reflect this. Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
*	Merge WebKit at r80534: Intial merge by Git	Ben Murdoch	2011-06-02	1	-0/+4
\| \| \| \|	Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
*	Merge WebKit at r75993: Fix conflicts.	Ben Murdoch	2011-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	StyleElement.cpp Do not undo cherry pick of http://trac.webkit.org/changeset/80787 Conflict due to intermediate change http://trac.webkit.org/changeset/75338 SliderThumbElement.cpp Conflict due to Android TOUCH_EVENTS addition and http://trac.webkit.org/changeset/75749 DOMWindow.cpp Conflict due to clearDomStorage and http://trac.webkit.org/changeset/75739 Page.cpp Conflict due to Android APPLICATION_INSTALLED addition and http://trac.webkit.org/changeset/75604 DragData.h See http://trac.webkit.org/changeset/75523 RenderBox.cpp Conflict due to PLATFORM_ANDROID addition and http://trac.webkit.org/changeset/75837 .gitignore - keep ours RenderSVGSolidColor.cpp This file moved, so copy over our edits. Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb
*	Merge WebKit at r75993: Initial merge by git.	Ben Murdoch	2011-05-16	1	-0/+92
	Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3