| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f
- CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447
- Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request
- Document.h - Take both, conflicts due to ANDROID_META_SUPPORT
- DragImage.h - Take both, conflict due to Android addition
- EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request
- EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS
- EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909
- FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS
- FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE
- FrameView.cpp - Take both, conflict due to Android frame flattening
- Geolocation.h - Merge conflicts due to Android-specific changes
- Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge
- GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards
- Gradient.h - Take both, conflict due to Android addition
- HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7
- HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element
- JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging
- MediaPlayer.cpp/h - Take both, conflict due to Android-specific change
- PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff
- RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening
- RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code
- Settings.cpp/h - Conflict due to ANDROID_PLUGINS
- TextInputController.h - Take upstream, git got confused
- V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29
- V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards
- WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge
- Widget.h - Take both, conflict due to Android addition
- jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset
- mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request
Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
|
|
|
|
| |
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
|
|
|
|
| |
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
|
|
|
|
|
|
|
|
|
|
|
|
| |
- AutoFillPopupMenuClient.h - Take theirs, git got confused
- PluginView.h - Conflict due to new OS macro
- Gradient.cpp - Conflict due to new argument due to setPlatformGradientSpaceTransform
- Android.derived.v8bindings.mk - Keep ours
- DragImage.h - Take both
- V8DocumentCustom.cpp - Take theirs
- XCode project - Take both to keep Android-addition of GeolocationPositionCache
Change-Id: I3f294a71af93fb4e02b57e0169bd25143132df15
|
|
|
|
| |
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
|
|
|
|
|
|
|
| |
- Database.cpp - This Android-specific change was made in https://android-git.corp.google.com/g/#change,39575
- XCode project - GeolocationPositionCache was accidentally removed in https://android-git.corp.google.com/g/#change,40365
Change-Id: I60f8361ba352c7fa8d35dc829e203f6c653f0ef2
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Take both for Android makefiles, other than typo for JavaNPObjectV8 upstream
- Take theirs for XCode project file and ChangeLog
- Fix trivial header conflict in V8DocumentCustom
- Keep ours for fix in JNIUtilityPrivate.cpp
- Take theirs for V8DOMWrapper.cpp. Conflict is due to Android addition of TouchEvents, which conflicts with http://trac.webkit.org/changeset/54259
- Take both for Android addition of applicationInstalledCallback
- Take both for Android JSC JIT changes in Platform.h
Change-Id: Ib1a748f204a07a7e736feeee6a0f30f7453754a7
|
|
|
|
| |
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
|
|
|
|
|
|
|
| |
Note that we update the XCode project file to add the new
GeolocationPositionCache files to allow us to build Android WebKit on Mac.
Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
|
|
|
|
|
|
| |
other platforms.
Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e
|
|
|
|
| |
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
|
|
|
|
|
|
|
|
| |
This is required to build Android WebKit on Mac.
See https://android-git.corp.google.com/g/#change,38319
Change-Id: I838567637b55aeed4d7b77e382ec6c8cffdb9e47
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Recent cherry-picks of WebKit patches were merged incorrectly into the XCode project file.
This change fixes those bad merges.
The relevant changes are ...
JavaInstance - http://trac.webkit.org/changeset/53412 - https://android-git.corp.google.com/g/#change,37667
JavaClass - http://trac.webkit.org/changeset/53443 - https://android-git.corp.google.com/g/#change,37669
JavaStringJSC - http://trac.webkit.org/changeset/53449 - https://android-git.corp.google.com/g/#change,37687
Bridge - http://trac.webkit.org/changeset/53464 - https://android-git.corp.google.com/g/#change,37680
JNIUtility - http://trac.webkit.org/changeset/53497 - https://android-git.corp.google.com/g/#change,37815
JNIBridge - http://trac.webkit.org/changeset/53557 - https://android-git.corp.google.com/g/#change,37961
JNIBridgeJSC - http://trac.webkit.org/changeset/53849 - https://android-git.corp.google.com/g/#change,38446
BridgeJSC - http://trac.webkit.org/changeset/53620 - https://android-git.corp.google.com/g/#change,37963
Change-Id: Ib434e467c8569781a8acbf1c9e7714946d6e4887
|
|
|
|
|
|
|
|
|
| |
JNIBridge to JNIBridgeJSC
See http://trac.webkit.org/changeset/53849
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: Ic73bf8213ae677b69e763a6b04f8c94f7f1eaed1
|
|
|
|
|
|
|
| |
See http://trac.webkit.org/changeset/53557
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I9a74b4dbdb0a9580372d69cec9e8f9fcab750e49
|
|
|
|
|
|
|
|
|
|
|
| |
jni_utility_private to JNIUtility and JNIUtilityPrivate
See http://trac.webkit.org/changeset/53497
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
This change required updating headers in Android-specific files in WebCore and WebKit.
Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
|
|\
| |
| |
| | |
Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
JavaString to a private implementation class
See http://trac.webkit.org/changeset/53449
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I61cfea194d679d506d92ca3951032531d6908965
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
WebCore/bridge/Bridge
See http://trac.webkit.org/changeset/53464
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in
PluginView.cpp to add a temporary ANDROID guard.
Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
to JavaClassJSC
Merge commit 'f83060e89e8ba30d0321f33164a0c4819f837a03'
* commit 'f83060e89e8ba30d0321f33164a0c4819f837a03':
Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
|
| |
| |
| |
| |
| |
| |
| | |
See http://trac.webkit.org/changeset/53443
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I0f2b0581e0850694953f79d45242c44d16bbf5fa
|
|\ \
| |/
| |
| | |
Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
|
| |
| |
| |
| |
| |
| |
| |
| | |
See http://trac.webkit.org/changeset/53412
Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick.
Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9
|
|/
|
|
|
|
|
|
| |
This is required to ease the process of upstreaming the Geolocation maximumAge handling code.
Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this.
Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
|
|
|
|
| |
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
|
|
|
|
| |
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
|
|
|
|
| |
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
|
|
|
|
| |
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
|
|
|
|
|
|
| |
This fixes http://b/issue?id=2103855.
Change-Id: I1811d97c59e0458a94347c8a63b4d1c0541dfaf7
|
|
|
|
|
|
| |
See https://bugs.webkit.org/show_bug.cgi?id=28264.
Change-Id: I30900239108ea699f194fceb30626f41c928c08e
|
| |
|
|
|
|
| |
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Automated import of CL 145796
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|