external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge WebKit at r80534: Intial merge by Git	Ben Murdoch	2011-06-02	1	-4/+30
\| \| \| \|	Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
*	Merge WebKit at r78450: Initial merge by git.	Steve Block	2011-05-24	1	-23/+16
\| \| \| \|	Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
*	Merge WebKit at r76408: Initial merge by git.	Ben Murdoch	2011-05-23	1	-0/+22
\| \| \| \|	Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
*	Merge WebKit at r75993: Fix conflicts.	Ben Murdoch	2011-05-16	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-25/+19
\| \| \| \|	Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
*	Merge WebKit at r75315: Fix conflicts	Steve Block	2011-05-13	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- HTMLInputElement.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS See http://trac.webkit.org/changeset/74895 - HTMLInputElement.cpp and RangeInputType.cpp Conflict due to refactoring of event handling on input elements See http://trac.webkit.org/changeset/74549 - DOMWindow.cpp Conflict due to DOMWindow::clearDOMStorage() See http://trac.webkit.org/changeset/74800 - EventHandler.cpp Conflict due to longpress and doubletap vs touch event refactoring See http://trac.webkit.org/changeset/74553 - History.cpp Trivial conflict due to cherry-pick See http://trac.webkit.org/changeset/74853 - GraphicsContext.cpp Conflict due to PLATFORM(ANDROID) guard See http://trac.webkit.org/changeset/74662 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/74971 Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
*	Merge WebKit at r75315: Initial merge by git.	Steve Block	2011-05-12	1	-0/+1861
	Change-Id: I570314b346ce101c935ed22a626b48c2af266b84