| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
|
|
|
|
| |
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
|
|
|
|
| |
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
|
|
|
|
|
|
|
| |
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
|
|
|
|
| |
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
|
|
|
|
| |
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
|
|
|
|
| |
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
|
|
|
|
| |
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
|
|
|
|
| |
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
|
|
|
|
| |
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
|
|
|
|
| |
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
|
|
|
|
| |
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
|
|
|
|
| |
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
|
|
|
|
| |
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
|
|
|
|
| |
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
|
|
|
|
| |
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
|
|
|
|
| |
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
|
|
|
|
| |
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
|
|
|
|
| |
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
|
|
|
|
| |
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
|
|
|
|
| |
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
|
|
|
|
| |
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
|
|
|
|
| |
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
|
|
|
|
| |
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
|
|
|
|
| |
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
|
|
|
|
| |
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
|
|
|
|
|
|
|
|
| |
- JavaInstanceJSC.cpp - Adds ANDROID guards around some temporary logging
- Geolocation.cpp - Adds ANDROID guards around changes waiting to be upstreamed
- WebChromeClient.h / EmptyClients.h - Pulls the Mac part of a WebKit change for which only the Android part was cherry-picked in https://android-git.corp.google.com/g/#change,41747
Change-Id: Ide97cb6b05e78528fe4b9430466837dedaadc4cf
|
|
|
|
| |
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
|
|
|
|
| |
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
|
|
|
|
| |
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
|
|
|
|
|
|
|
|
| |
to the FrameLoaderClient that the BackForwardList has been modified.
This needs to be upstreamed to webkit.org.
Change-Id: I14633c51276bd92ed56139b4c473cc8ac9bacb72
|
|
|
|
| |
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
|
|
|
|
| |
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
|
| |
|
| |
|
|
|
|
| |
This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
|
|
|
|
|
|
| |
brings it in sync with webkit svn cl 42046
Automated import of CL 146110
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|