summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/qt
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()Steve Block2012-03-282-7/+7
| | | | | | | | | | | | | | This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix window.location. Note that a conflict occurred in Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the change is not required. See http://trac.webkit.org/changeset/87623 Bug: 2159848 Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-1075-356/+3455
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-0849-197/+1984
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-0244-29738/+31739
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-2432-186/+1093
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-231-1/+1
| | | | | | | | Cherry pick of upstream http://trac.webkit.org/changeset/79988 Needed now due to FastAllocBase and Noncopyable changes in this merge. Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-236-5/+81
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-16190-0/+71945
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3