| 6ed1fdfa7999878a811b09cdd647fbeace4353b8 |
|
27-Mar-2012 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()
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
/external/webkit/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
|
| 65f03d4f644ce73618e5f4f50dd694b26f55ae12 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
/external/webkit/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
|