summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/KURL.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick WebKit change r96779 to fix window.locationSteve Block2012-03-281-4/+6
| | | | | | | | | | See http://trac.webkit.org/changeset/96779 Note that a conflict occurred in Source/WebCore/platform/qt/KURLQt.cpp but the change is not required. Bug: 2159848 Change-Id: I56e645b2f187302c6f1858c8c6c291209f130cad
* Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()Steve Block2012-03-281-1/+1
| | | | | | | | | | | | | | 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
* Cherry-pick WebKit change r84762 to fix URL canonicalizationSteve Block2012-03-281-5/+26
| | | | | | | | | | | | | | This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that the 'http:example.com/' test case in fast/url/standard-url.html fails with DRT2 because of an assumption in the test that it is served as a file scheme URL. See http://trac.webkit.org/changeset/84762 Bug: 2159848 Change-Id: Ie680debcad3d285efd40134932b72d429c0d2222
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-6/+18
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-38/+55
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-26/+89
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+1855
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84