summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/loader/FrameLoader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove changes with upstream WebKitKristian Monsen2011-11-171-2/+2
| | | | | | | | | | Fix for bug 5626884, removing some small changes with upstream that was spotted as part of CL: https://android-git.corp.google.com/g/#/c/148917 No functional difference. Change-Id: I62c8a24e17c3ab86eebff997b87e5bced88e0807
* Removing ANDROID_INSTRUMENTATION codeKristian Monsen2011-11-171-15/+0
| | | | | | | | | | | | | | This has not been used for years, and due to WebKit merges the results are not accurate anymore. The resulting code is cleaner, less likely to create merge conflicts, and does not give the impression that this can be turned on and it will still work. Needs CL: https://android-git.corp.google.com/g/#/c/148912/ Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
* Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the ↵Steve Block2011-10-191-1/+1
| | | | | | | | | cache on back navigation See http://trac.webkit.org/changeset/89982 Bug: 5480361 Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37
* Cherry-pick WebKit change 93521 to fix FrameLoaderSteve Block2011-09-091-8/+27
| | | | | | | | | | | See http://trac.webkit.org/changeset/93521 Note that the change did not apply cleanly to FrameLoader::stopLoading() because we don't have http://trac.webkit.org/changeset/90164. See bug for details. Bug: 5264509 Change-Id: I824284b9daaa8bc033aebca558d5362ebfb617d8
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-10/+16
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-80/+105
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-36/+37
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-251-43/+5
| | | | | | | | | | | | | This replaces, and therefore conflicts with, Android's existing ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the upstream guard in WebCore, updates WebKit to use the new guard, and enables this guard on Android. See http://trac.webkit.org/changeset/78439 See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-53/+93
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-11/+26
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161-32/+19
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+3566
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2025-06-10 20:14:04 +0000