| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
|
|
|
|
|
|
|
| |
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: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
|
|
|
|
| |
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
|
|
|
|
| |
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
ChromeClient.h:
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h
CSSParser.cpp:
Conflict due to ANDROID_INSTRUMENT
http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp
Node.cpp:
Conflict due to ANDROID_DOM_LOGGING
http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp
npapi.h:
Conflicts due to various #ifdef ANDROID
http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h
PlatformTouchEvent.h:
PlatformTouchEventAndroid.cpp:
PlatformTouchPoint.h:
Conflicts due to new BREWMP code next to changed Android code
Initial webkit CL:
http://trac.webkit.org/changeset/68499
Later fix after merge revision, so cherry-picked:
http://trac.webkit.org/changeset/69034
RenderBox.cpp:
Several changes, conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68238#file2
http://trac.webkit.org/changeset/68239#file3
http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp
The correct resolution here is unclear. A closer investiagtion by somebdoy
more familiar with the code is tracked with b/3071198
RenderBox.h:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h
RenderIFrame.cpp:
Conflicts due to ANDROID_FLATTEN_IFRAME
http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp
RenderTable.cpp:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp
RenderView.cpp:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp
Settings.cpp:
Settings.h:
Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL
http://trac.webkit.org/changeset/68166
Widget.cpp:
http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp
Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
|
|
|
|
| |
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
|
|
|
|
| |
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
|
|
|
|
| |
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
|
|
|
|
| |
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
|
|
|
|
| |
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
|
|
|
|
| |
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
|
|
|
|
| |
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Used the UserGestureIndicator class instead of the local ANDROID_USER_GESTURE code. I have made a simple test case for the problem at:
http://updates.monsen.it/source.html
This cannot be made into a layout test since the Android Dumprendertree does not support focus on windows other than the main one.
Lots of local changes removed, but not many actual changes. Most are in parameters sent to other functions.
As far as I can see they user gestures are only checked for in ChromeClientAndroid.cpp and WebCoreFrameBridge.cpp, and I
replaced ANDROID_USER_GESTURE with UserGestureIndicator::processingUserGesture().
The UserGestureIndicator class was added to webkit in this CL:
http://trac.webkit.org/changeset/57045
ResourceRequest.h is a cherry-pick of this CL from webkit.org
http://trac.webkit.org/changeset/62668
Change-Id: Ia254b2cee833459fcc2cacfb2751ef7a29a8f64a
|
|
|
|
| |
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
|
|
|
|
|
|
|
|
|
|
| |
to java land if that is the case.
Requires a frameworks/base change.
b/2766917
Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
|
|
|
|
| |
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Geolocation permission request
This is part of the change required to fix a Geolocation permissions bug.
See https://android-git.corp.google.com/g/#change,40601
Note that We take only the WebCore component of the change, but additional
changes are required to ChromeClientAndroid.
See http://trac.webkit.org/changeset/55136
Change-Id: Iff0eab3adc3e41876df7f114c0d50243d015664f
|
|
|
|
|
|
|
|
|
|
|
| |
detached rather than when eventHandlers are cleared for a frame.
Also no longer keep track of the number of touch event handlers that a page has registered. If a page requests touch events, always
send them from Java until a new page is loaded. This simplifies the logic when dealing with the page cache as otherwise as well as
restoring the forwarding of touch events when a page is restored from the page cache, we would need to restore the number of touch handlers
that have been registered.
Change-Id: I0269e1632a37ccbf105bac658c2cb7f1d5cd3052
|
|
|
|
|
|
| |
the Qt team.
Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
|
|
|
|
| |
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This does not work in the javascript case because the user gesture is stored in
the caller's script environment and that knowledge is not obtainable in the
receiving frame. However, this change allows targeted links to change the focus
to the correct window but prevents sites like slate.com from changing back to
the opening window.
This change will be followed by a simple revert of the previous change in the
Browser app.
Bug: 2161671
|
|
|
|
| |
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
|
|
|
|
| |
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
|
|
|
|
| |
Automated import of CL 145796
|
| |
|
| |
|
| |
|
| |
|
|
|