| e48d279609693b4d164199748c93ad791547c649 |
|
27-Mar-2012 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change r96779 to fix window.location
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
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 5f000f6f06377295cba1d3246dbd601610cdbd16 |
|
16-Nov-2011 |
Kristian Monsen <kristianm@google.com> |
Remove changes with upstream WebKit
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
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| b359438e11520b3e3b6801ad1280e1bdef2b986c |
|
09-Nov-2011 |
Kristian Monsen <kristianm@google.com> |
Removing ANDROID_INSTRUMENTATION code
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
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 1e986ec96b7ff9d1ee56e1063ebd99ee22bb1ce2 |
|
19-Oct-2011 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache on back navigation
See http://trac.webkit.org/changeset/89982
Bug: 5480361
Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 131c31a2d968d23bd0a02c4f7a06a69900fa419d |
|
08-Sep-2011 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 93521 to fix FrameLoader
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
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| d73b16bdebb9d20b17be0a30e626dc9e66b6d868 |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
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
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| 65f03d4f644ce73618e5f4f50dd694b26f55ae12 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/loader/FrameLoader.cpp
|