summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-124-281/+0
| | | | | | | | | | | | | 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
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1229-4305/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101-2/+1
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* resolved conflicts for merge of 9fa3237f to masterLeon Scroggins2011-03-161-1/+2
|\ | | | | | | Change-Id: I04c05a531d31cd8f44104a31f107eba786aaa9b4
| * More improvements to video player controls.Leon Scroggins2011-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:4080127 Inset the track by half the width of the thumb so the thumb travels along the entire length of it. Make the track narrower vertically, and align it with the center of the thumb drawing. Draw the portion of the track that has already been covered with a different asset. Change-Id: I37acedc8e8b75bab59fcac7e075c59d70550795c
* | am 38f3c4a2: am 833c9cea: Improving HTML5 video controlsNicolas Roard2011-03-142-8/+11
|\ \ | |/ | | | | | | * commit '38f3c4a204bfa7d75953f6d9cbd489b696d5a8b1': Improving HTML5 video controls
| * Improving HTML5 video controlsNicolas Roard2011-03-142-8/+11
| | | | | | | | | | | | | | | | | | - correct support for the fullscreen button - change the controls to be 48px high - auto-hide the controls, touching the video makes them appear again bug:2126902 Change-Id: Idd2b720034de3d5d432c9ea62d9045934c46f6c1
* | am be37cc60: am 9bddcae7: Merge "b/3392594 keep the remaining touch points ↵Huahui Wu2011-03-141-2/+2
|\ \ | |/ | | | | | | | | | | when one is ended." into honeycomb-mr1 * commit 'be37cc60f3c8675b9a0d1d49d0efe5afedd6298d': b/3392594 keep the remaining touch points when one is ended.
| * Merge "b/3392594 keep the remaining touch points when one is ended." into ↵Huahui Wu2011-03-141-2/+2
| |\ | | | | | | | | | honeycomb-mr1
| | * b/3392594 keep the remaining touch points when one is ended.Huahui Wu2011-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | This is native side code for b/3392594, which takes the action index from java side, and set the touch point state accordingly. Change-Id: I894bcfc25f761725a5f37317a8fadffbba68b6df
* | | resolved conflicts for merge of 43edd45c to masterNicolas Roard2011-03-111-10/+34
|\ \ \ | |/ / | | | | | | Change-Id: I270cbb054174dd3c2dc4464b484ad2c5a8db2724
| * | Improve HTML5 audio/video controlsNicolas Roard2011-03-111-10/+34
| | | | | | | | | | | | | | | | | | | | | Only allow translucent controls for video... bug:2126902 Change-Id: I95fbf1fc736391a3adec3930119531684a1a9082
* | | resolved conflicts for merge of 24e276c8 to masterNicolas Roard2011-03-111-1/+7
|\ \ \ | |/ / | | | | | | Change-Id: I1f46d4444330bf7e03b99a5d0089e9388b9ea8bd
| * | HTML5 Video improvementsNicolas Roard2011-03-111-1/+7
| |/ | | | | | | | | | | | | | | | | - remove the seek buttons on the control bar - make the control bar translucent - add a fullscreen button passing the layer id to the java side bug:2126902 Change-Id: Id9638f6b01f968839eaf4b0bd8cf1603957753af
* | Use members rather than globals to avoid leaking memory.Leon Scroggins2011-03-041-3/+17
|/ | | | | | | | Part of bug:3009375 Requires a change to frameworks/base. Change-Id: I9f5e86afff4c87e16889eadf0ad0049120885480
* match UI text selection background colorCary Clark2011-02-161-3/+9
| | | | | bug:3451973 Change-Id: Ie334c54ebb6b5b1083616739f9a90b8e8f3b6693
* Improve the fixed element position calculationTeng-Hui Zhu2011-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | In the previous WAR, we get the screen size from UI thread at every draw call. That is awkward. Now with Java side fix, we can get the screen size from setSize call now. However, forcing a full re-layout seems like an expensive operation. What we need to make the webkit to know the update can be done by just updating the fixed position elements only. So I have done these: 1. Take away the WAR by forcing the update at the convertToLayerCoord. 2. Get rid of the UI thread stuff used to tell WebViewCore the screen size. And get rid of the redundant variables, too. 3. update the fixed element at the setSize time. BTW, I also rename the PlatformBridge functions name. bug: 3397602 Change-Id: I0c422ecdb570de89aecb6e568d5067acf18ecfc6
* Use ListBoxPopupMenuClient for listboxes.Leon Scroggins2011-02-033-78/+38
| | | | | | | | Bug:2754767 Enables us to remove some layering violations. Change-Id: Iea184c7946bca9d840c708918f545a9d9b436254
* Fixed element positioning fixTeng-Hui Zhu2011-01-301-0/+3
| | | | | | | | | | | | | | | | | | This is for fixed bottom/ right, in the zooming case. The width and height in webkit should be calculated as the visibleRect we use for drawing. And that is document coordinate for visible size. Basically it is send the Rect info from webView to webViewCore. Then at RenderBox, it will go through the PlatformBridge to pick the info up. Notice that the touch is not 100% working yet, the layout call in webkit can have a early return such that fixed element layer didn't get update. And a touch/click is not really causing the whole layout update yet. That will be addressed in seperate change though. bug:3404129 Change-Id: I225d41815143a05d540ed32bfc76f823603ca89c
* Use platform bridge to control high usage delta MB.Shimeng (Simon) Wang2011-01-241-0/+1
| | | | | | | This change gives flexibility to change that value in Java side. issue: 3317722 Change-Id: I71a548871783cc604e0daec63e6bbfb26ecc1e1f
* b/3133123 Pass touch point ids to WebKitHuahui Wu2011-01-131-2/+4
| | | | | | | | | This is the CL in WebKit side and it needs the framwork CL: https://android-git.corp.google.com/g/#change,89630 Notice some changes touch open source WebKit's code, so b/3351313 is filed to keep track of that. Change-Id: I0ac5d75c4a90f14afeb2e3fc2dc5b1c437c631f8
* Ensure that PopupReply does not take action after disconnection.Leon Scroggins2011-01-102-8/+36
| | | | | Bug:3326203 Change-Id: Ieec8765fae0af7d4f2b0f56167cb1b221fa73687
* When canceling <select> popup leave the value unchanged.Leon Scroggins2011-01-061-0/+3
| | | | | | Bug:3328658 Change-Id: I70e7fa72a0f2df3957cb295efdf404fd91511610
* Merge Webkit at r73109: Fix conflictsShimeng (Simon) Wang2010-12-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | 1. WebCore/Android.jscbindings.mk http://trac.webkit.org/changeset/72590 http://trac.webkit.org/changeset/72344 2. WebCore/WebCore.vcproj/WebCore.vcproj too many changes between 72274 and 73109 http://trac.webkit.org/log/trunk/WebCore/WebCore.vcproj/WebCore.vcproj also due to Android change. https://android-git.corp.google.com/g/#change,37374 3. WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/72631 4. WebCore/rendering/RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 our code is not upstreamed 5. WebCore/rendering/RenderView.h http://trac.webkit.org/changeset/72852 http://trac.webkit.org/changeset/73063 Change-Id: Id7a1dbdfef6327b4fe08c9884122bf9decd039ca
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-223-1/+40
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Fix for <select> elements.Leon Scroggins2010-12-073-21/+103
| | | | | | | | | | | | Bug:3230016 Allow webkit to handle the click on a <select> element if it is a RenderMenuList. Implement PopupMenu class, using PopupMenuClient to interact with the <select> element. Change-Id: I9611c23304fc2fc3eb01ecbd7a46fa02cd52df9a
* Rewrite scrollable layers using multiple layers.Patrick Scott2010-12-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | Remove PlatformBridge::updateLayers and instead call layersDraw from ChromeClientAndroid during a requested sync. Instead of LayerAndroid having knowledge of scrolling pictures, use multiple layers (background, mask, foreground). Update navigation to use the new structure. Always record nodes in absolute, unscrolled coordinates. Do not track layers unless the node has a composited layer and a last child. Check for composited parents when adding to tracked layers as well. TODO: * developer.android.com doesn't completely work with navigation due to some nodes being clipped out. * BaseLayerAndroid needs to be able to operate with a matrix other than identity. * nested fixed position elements do not draw correctly. * nested overflow layers haven't been tested. Change-Id: I0e2bd37612341e8884d68153ab36194cb2dc1eeb
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-024-11/+32
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Fix conflicts.Teng-Hui Zhu2010-11-172-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/loader/FrameLoader.cpp http://trac.webkit.org/changeset/70960 http://trac.webkit.org/changeset/70971 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/71218 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71218 WebCore/html/HTMLLinkElement.cpp http://trac.webkit.org/changeset/71159 WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/71484 WebCore/platform/android/TemporaryLinkStubs.cpp http://trac.webkit.org/changeset/71484 WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/71382 http://trac.webkit.org/changeset/71251 WebCore/rendering/RenderLayer.cpp http://trac.webkit.org/changeset/71536 WebCore/rendering/RenderTable.cpp http://trac.webkit.org/changeset/71382 WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71515 WebCore/bindings/scripts/CodeGeneratorV8.pm http://trac.webkit.org/changeset/71227 http://trac.webkit.org/changeset/71230 Change-Id: I3ad8c6bc6e36c90aedebedf915a8614b2c786550
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-173-0/+50
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: moved stub to right namespaceJohn Reck2010-11-091-1/+5
| | | | | | Cherry pick of http://trac.webkit.org/changeset/71346 Change-Id: Id64a084c3e0e74e5b9ec7c0c22141b46b044097d
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-0/+6
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Update the layers onlyNicolas Roard2010-11-011-0/+3
| | | | | | | | C++ counterpart to https://android-git.corp.google.com/g/#change,77500 Bug:2975990 Change-Id: I3b8fd27f991d6776059a15eef36d0c9a7b44f9bb
* Merge Webkit at r70209: defaultLanguage has been renamed.Ben Murdoch2010-10-261-1/+1
| | | | | | | It is now known as defaultPlatformLanguage. See http://trac.webkit.org/changeset/70095 Change-Id: I523e93e78317a2e365429a8027967aa46d0370fa
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-0/+4
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Rename to_string() to jstringToWtfString() for greater claritySteve Block2010-10-151-1/+1
| | | | Change-Id: I8516c4f39a38e236d0bff38a91fe8657cfcf8ad4
* Fix WebCore/WebKit layering violation.Ben Murdoch2010-10-081-0/+3
| | | | | | | | | | | Move the call to WebViewCore::updateTextfield() to the PlatformBridge so that WebCore code does not depend on WebKit code to compile. In addition to being a layering violation, the inclusion of WebViewCore.h includes WebCoreJni.h, which in a future change causes LOG to get #undefined when using the chromium net stack. Change-Id: Id88d332624323e03ce82120ef55db200cbabe63b
* Fix a WebCore/WebKit layering violationBen Murdoch2010-10-081-0/+3
| | | | | | | | | | | | Move the call to WebViewCore::updateViewport() from HTMLBodyElement and HTMLMetaElement to the PlatformBridge so that WebCore code does not depend on WebKit code to compile. In addition to being a layering violation, the inclusion of WebViewCore.h includes WebCoreJni.h, which in a future change causes LOG to get #undefined when using the chromium net stack. Change-Id: I1a9fd0b545080c9c0d9d26a3e5eb3b986c3986eb
* Remove dependency of WebCore ScreenAndroid on platform APISteve Block2010-10-082-31/+15
| | | | | | | | | | Note that this change forks two WebCore files, but both files are already forked and are unlikely to be changed upstream by non-Android contributors. All changes to both files will be upstreamed at a later date. Bug: 2439218 Change-Id: I1e56ee12cec17df38a1404ab06c8897c22f2fd19
* Revert "Prohibit scrolling not initiated by the user."Leon Scroggins2010-10-072-4/+1
| | | | | | | | | | | | | Bug:3067265 This reverts commit f116b073399a3c3f644d6e6aeb2521ef9d2c9e9b. Conflicts: WebCore/platform/android/PlatformBridge.h WebKit/android/WebCoreSupport/PlatformBridge.cpp Change-Id: I358ce936a8c6f99717b976cfa07e7fe26014760a
* Merge Webkit at r68651 : Fix conflicts.Kristian Monsen2010-10-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-074-6/+70
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* b/3039749 resolving the conflicts for WebKit.Huahui Wu2010-10-042-3/+0
| | | | Change-Id: If67e444a050d2a96e7d076c4faee8a160e08d4d5
* Bug: 2372180Huahui Wu2010-09-272-4/+9
| | | | | | | | | | | | | | | This CL adds support to pass multi-touch event from browser to webkit. PlatformTouchEvent.h and PlatformTouchEventAndroid.cpp: changed the android constructor to take multiple touch points. PlatformTouchPoint.h and PlatformTouchPointAndroid.cpp: changed the android constructor to take a touch point ID. WebViewCore.h and WebViewCore.cpp: 1. Updated handleTouchEvent(), HandleTouchEvent(), and jni interface to take multiple points. 2. Added support of action MotionEvent.ACTION_POINTER_DOWN & MotionEvent.ACTION_POINTER_UP. Change-Id: I79cffdba12a60ced9a571b4c1fd5b520a0fb6074
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-1/+1
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* communicate drawing pause to webkit to pause gif animationCary Clark2010-08-241-0/+8
| | | | | | | | | | | | | | Gif frames continue even if the webkit changes aren't drawn. When we suspend drawing, suspend the gif animation as well. This is accomplished by fooling webkit into thinking the browser window is offscreen. When the webkit drawing is resumed, invalidate the entire content so the gif animations start up once more. requires companion change in frameworks/base Change-Id: I78846214048b038cd8d0401dad103d451cd5a269 http://b/2621902
* Merge WebKit at r65615 : Fix include paths for string headers.Iain Merrick2010-08-231-1/+2
| | | | | | These moved to <wtf/text> in http://trac.webkit.org/changeset/65077 Change-Id: Ie234f1a09013e48a5241d9e240c5b2e85ca75125
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-232-0/+109
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Fix for incognito mode cookies from WebCore.Elliott Slaughter2010-08-181-3/+4
| | | | Change-Id: Id7c2ae708c166da035f1fdda8351b921d86d78de
generated by cgit v1.1 at 2025-08-17 11:11:29 +0000