| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
| |
Bug: 5218987
Change-Id: Ie88a117e52d1835114415ee6721108d8a882594a
|
|
|
|
|
|
|
| |
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I35a9fa5e53a83a9c9a920333a3752dd151fbd3b8
|
|\
| |
| |
| |
| | |
* commit '797c8d1884320bf1f1c034a8ab96fdacde0eb101':
Do not load uncached images if blocked by embedding app.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure that onload callbacks are not sent for images that
are not actually loaded.
This is based off the patch and discussion in
https://bugs.webkit.org/show_bug.cgi?id=71661
Bug: 5522414
Change-Id: I6366448bce5dd053bda3bfecb18c02943fe645a2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The upstream notImplemented() is only enabled in debug builds. Currently,
we use an Android-specific implementation of notImplemented(), which is enabled
in all builds.
We probably don't want this logging in all builds: logging in debug builds only
is sufficient. Also, now that WebKit logging is functional (b/5448972), we
don't need an Android-specific implementation of notImplemented().
This patch removes our local edit to address both of these.
Change-Id: I07e2e8cb42d99dece1c711508c297d8ae0bdda72
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
See http://trac.webkit.org/changeset/98548
Bug: 5448972
Change-Id: I099d9ca9e63cbc6e8c3e163ecb2b0a0c82d1141a
|
|/
|
|
|
|
|
| |
See http://trac.webkit.org/changeset/89708
Bug: 5448972
Change-Id: I03d576b0c819fdb9a6d99fea8099cf7120945a45
|
|
|
|
|
|
|
|
|
| |
cache on back navigation
See http://trac.webkit.org/changeset/89982
Bug: 5480361
Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
substituted data
This is a temporary workaround for a WebCore bug which is awaiting resolution.
See https://bugs.webkit.org/show_bug.cgi?id=68711 and this bug for details.
This change adds a new property to Frame to track when its Document pointer is
up-to-date. This is is used only when setting up the securty context for a
Document with substituted data and allows us to skip the buggy check in
Document::loader().
Bug: 5188895
Change-Id: I5d7d2cca83fa0c6db084d505f5b48207046a9cd0
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
|
|
|
|
| |
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
|
|
|
|
|
|
|
|
| |
ApplicationCacheGroup.cpp
This is a partial cherry-pick of http://trac.webkit.org/changeset/86949
Change-Id: I3516e5ca899ed44747b15bff019b146e0dea6b64
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- RenderLayerBacking.cpp
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81715
- Document.cpp
Due to domTreeVersion and ANDROID_STYLE_VERSION
http://trac.webkit.org/changeset/80797
- CachedResourceLoader.cpp
Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
http://trac.webkit.org/changeset/80695
- Settings.cpp/h
http://trac.webkit.org/changeset/81289
http://trac.webkit.org/changeset/81635
- MediaPlayer.cpp
Whitespace only
http://trac.webkit.org/changeset/80874
- RenderBox.cpp
Due to isHorizontalWritingMode
http://trac.webkit.org/changeset/81716
- RenderLayer.cpp/h
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81981
- CSSStyleSelector.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/80993
http://trac.webkit.org/changeset/80998
http://trac.webkit.org/changeset/81684
http://trac.webkit.org/changeset/82378
- CSSParser.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/81684
- StyleElement.cpp
Due to cherry pick of http://trac.webkit.org/changeset/80787
http://trac.webkit.org/changeset/82054
- EventHandler.cpp
Due to ANDROID_PLUGINS
http://trac.webkit.org/changeset/81618
http://trac.webkit.org/changeset/81835
- SliderThumbElement.cpp
Due to touch events
http://trac.webkit.org/changeset/81216
- MediaControls.cpp
Due to touch events
http://trac.webkit.org/changeset/80857
Note that the WebKit history for this file is confusing as it was
renamed in http://trac.webkit.org/changeset/83545 and then re-added in
http://trac.webkit.org/changeset/84222 but trac is not smart enough to
track history backwards from http://trac.webkit.org/changeset/84222.
Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
|
|
|
|
| |
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
|
|
|
|
|
|
| |
This will avoid future merge conflicts
Change-Id: I5d4cc4665ed096b86a7f6dc892bd44ff4c590e65
|
|
|
|
|
|
| |
Make sure initializer list is in same order as members in header.
Change-Id: I93dfd1c6bba851b8fb8fb839d2b5b1c226a78dcd
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223
Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978
Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367
HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.
HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.
CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.
MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.
FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.
NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.
PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988
RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.
Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
|
|
|
|
| |
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Document.cpp
Conflict due to AX object cache disabled on Android
See http://trac.webkit.org/changeset/78314
- CachedResourceLoader.cpp/h
Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/76701
- Source/WebCore/page/ChromeClient.h
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
See http://trac.webkit.org/changeset/77509
- FrameView.cpp
Conflict due to Android FrameView::updatePositionedObjects()
See http://trac.webkit.org/changeset/77274
- ScrollView.h
Conflict due to Android
ScrollView::actualWidth/Height/ScrollX/ScrollY()
See http://trac.webkit.org/changeset/76831
- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
conflict due to Android stubbed out
MIMETypeRegistry::getMIMETypeForExtension()
See http://trac.webkit.org/changeset/77368 and
https://android-git.corp.google.com/g/#change,37272
- ImageDecoder.cpp
Conflict due to Android excluding code
See http://trac.webkit.org/changeset/77427
- ImageDecoder.h
Conflict due to ANDROID guard upstreamed as SKIA guard
See http://trac.webkit.org/changeset/77946
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/76743 and
http://trac.webkit.org/changeset/77286
- RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT
See http://trac.webkit.org/changeset/77062
Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
|
|
|
|
| |
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
|
|
|
|
|
|
|
|
|
|
|
| |
A new WEB_ARCHIVE enable guard will be added upstream in
http://trac.webkit.org/changeset/78439, replacing our downstream
ARCHIVE guard.
This patch removes a couple of instances of the downstream guard that
are not required and hence will not be replaced by the upstream guard.
Change-Id: Ibc8ca754617e8b34fd8563f6f3b9fa671e871f23
|
|
|
|
| |
Change-Id: I6adc6f64f3833d3bc5016da929ffd1e95930d5c5
|
|
|
|
| |
Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
|
|
|
|
| |
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This moves files in the following WebCore subdirectories ...
- bindings/js
- bindings/v8/custom
- plugins/android
- platform/android
- platform/graphics/android
- page/
- css/
- dom/
- loader/archive/android
|
|
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
|