summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/page/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-1/+1
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-1/+1
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r76408: Fix EventHandlerAndroid.cppBen Murdoch2011-05-231-3/+0
| | | | | | | | | See http://trac.webkit.org/changeset/76248 which introduced an include of Clipboard.h, causing the real definition of WebCore::Clipboard to be included in EventHandlerAndroid.cpp. Remove the stub that was there. Change-Id: I5bc04bf573aa1da19cbdd282d3611f571e46c6fa
* Merge WebKit at r75993: Fix DragControllerAndroid.cppBen Murdoch2011-05-161-1/+1
| | | | | | | DragData::containsURL now takes a Frame* parameter. See http://trac.webkit.org/changeset/75523 Change-Id: Ic32fc5857389dd87eec055dbdd7a361ab6d4dba7
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161-1/+1
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-122-0/+186
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84