summaryrefslogtreecommitdiffstats
path: root/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-26287-2913/+8699
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge "Remove unused dispatchDidLoadResourceByXMLHttpRequest"Ben Murdoch2010-10-252-5/+0
|\
| * Remove unused dispatchDidLoadResourceByXMLHttpRequestBen Murdoch2010-10-252-5/+0
| | | | | | | | | | | | See http://trac.webkit.org/changeset/57210 Change-Id: I82ddff6e4d04e2c36dad2518e4e27a695728bc95
* | Hide details of private browsing for URLRequestContext from Chromium ↵Steve Block2010-10-251-1/+6
| | | | | | | | | | | | AutoFill code Change-Id: I58a388ecf16b2af4f1cd31afb39d0aa6c5c44a24
* | Add a JNI method to determine which HTTP stack is in useSteve Block2010-10-251-1/+10
|/ | | | | | | | | This will be required when hooking up CookieManager to the Chromium stack, as we need to decide in Java whether or not to call into native code. Bug: 3116410 Change-Id: I4e148ad2c38a6e5771912dc419f52c8098027958
* Fix for ALT_HTTP build breakKristian Monsen2010-10-222-2/+4
| | | | | | | Was broken by this CL: https://android-git.corp.google.com/g/#change,75473 Change-Id: I6f60fd1e19eafe84f9d2f72f556493a25c2caf0e
* For non user-scrolled scroll, don't send scroll event.Shimeng (Simon) Wang2010-10-222-8/+10
| | | | | | | | This is in conjunction with Java side CL: https://android-git.corp.google.com/g/75647 issue: 3063945 Change-Id: I3f0bb11e25ee4ea7615980e2bc6cefb2064d4d9d
* Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"Steve Block2010-10-224-1/+65
|\
| * Hook up CookieManager.removeAllCookie() for the Chromium HTTP stackSteve Block2010-10-224-1/+65
| | | | | | | | | | | | | | | | Requires a change to frameworks/base ... https://android-git.corp.google.com/g/75471 Bug: 3086308 Change-Id: I062015c990f6bc3d77ec22c746bd8465ed74bd08
* | Merge "Fix a compiler warning in WebRequest.cpp"Steve Block2010-10-221-2/+2
|\ \ | |/ |/|
| * Fix a compiler warning in WebRequest.cppSteve Block2010-10-221-2/+2
| | | | | | | | Change-Id: I4ece067b344b7a132f04451ce9810993d8ed73f0
* | Fix naming for JNI registration methodsSteve Block2010-10-2214-42/+42
|/ | | | Change-Id: I1aba39bdcf217bff751e42d2a335cd230b8193f7
* Merge "Fix debug statements."Patrick Scott2010-10-212-1/+2
|\
| * Fix debug statements.Patrick Scott2010-10-212-1/+2
| | | | | | | | Change-Id: Id37bf0a8b5864fea2490bd2dc5d4a1f52bc56c1d
* | Merge "Move jstringToStdString into WebCoreJni.h"Steve Block2010-10-213-9/+16
|\ \ | |/ |/|
| * Move jstringToStdString into WebCoreJni.hIain Merrick2010-10-213-9/+16
| | | | | | | | | | | | | | Also tweaked the implementation slightly to match jstringToString16, which is more robust. Change-Id: I614576615a6f429ea1632c395d5bc4e068c32cfb
* | Fix Chromium HTTP request context getters to use raw pointersSteve Block2010-10-216-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All call sites into the Chromium stack take raw pointers rather than scoped_refptr, so we should do the same for simplicity. This change also makes the ownership model more clear. Previously we were sometimes throwing away the scoped_refptr and using the raw pointer, which is unsafe unless you know that somebody else holds a reference. Requires a change to external/chromium ... https://android-git.corp.google.com/g/75220 Change-Id: I09c86d424193a3f3c2644bcf77a2d363fa24293b
* | Merge "Fix AutoFill after merge to Chromium merge to 7.0.540.0"Ben Murdoch2010-10-203-7/+11
|\ \
| * | Fix AutoFill after merge to Chromium merge to 7.0.540.0Ben Murdoch2010-10-203-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium now seems to enforce that profile unique ids cannot be zero (as the default ctor leaves them). Read the correct id from the Java WebSettings.AutoFillProfile class. Requires a corresponding change in frameworks/base: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f. Change-Id: I736220dccd8d68c395d6742e38a063da4140a13b
* | | Merge "Implement file downloads for Chrome HTTP stack (C++ side)"Ben Murdoch2010-10-209-12/+75
|\ \ \ | | |/ | |/|
| * | Implement file downloads for Chrome HTTP stack (C++ side)Iain Merrick2010-10-209-12/+75
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the way the WebView API works, downloads are handled by the Java client code via the DownloadListener interface, so we need to toss them over the JNI wall. I had to refactor WebResourceRequest slightly to save the user-agent header before it gets stripped out. I have also made it const-correct. Test: manually checked that we can download a file, with both stacks. See matching change in frameworks/base (I87e71deb) Change-Id: I8130040099d02c399d42b223444b333398628235
* | Merge "Removes the unused default userAgent from WebRequestContext"Steve Block2010-10-201-1/+4
|\ \ | |/ |/|
| * Removes the unused default userAgent from WebRequestContextSteve Block2010-10-201-1/+4
| | | | | | | | | | Bug: 3035160 Change-Id: Iaf163ea571f5d9811b5d14f83e5b02948748ff84
* | Fix for Find scrolling too often.Leon Scroggins2010-10-192-7/+24
| | | | | | | | | | | | | | | | | | | | | | Bug:3108852 Do not scroll if nativeFindAll is called with the same string and the current match location has not changed. Requires a change to frameworks/base. Change-Id: Id3f104d91a0061f1d007b54a8fdd188b239e7970
* | am 15643db2: am 77ab6dc8: Don\'t force video end event when full screen ↵Shimeng (Simon) Wang2010-10-191-0/+17
|\ \ | |/ |/| | | | | | | | | | | | | video playing is returned. Merge commit '15643db2b790d467b78582c3bad440fb42d35df1' * commit '15643db2b790d467b78582c3bad440fb42d35df1': Don't force video end event when full screen video playing is returned.
| * am 77ab6dc8: Don\'t force video end event when full screen video playing is ↵Shimeng (Simon) Wang2010-10-181-0/+17
| |\ | | | | | | | | | | | | | | | | | | | | | | | | returned. Merge commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55' into gingerbread-plus-aosp * commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55': Don't force video end event when full screen video playing is returned.
| | * Don't force video end event when full screen video playing is returned.Shimeng (Simon) Wang2010-10-181-0/+17
| | | | | | | | | | | | | | | | | | | | | Use pause instead. issue: 3102273 Change-Id: Ic4ba84a5d9f7976abbb8ff0443f1d00f4a8390f8
| * | am 156ddd48: Add more padding round select boxes, use different assets at ↵Leon Clarke2010-10-182-34/+80
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | different resolutions, use new assets and don\'t deform the arrows when stretching the select box. http://b/issue?id=2506670 Merge commit '156ddd48e9c54012469fed6e7341586e0425c3d2' into gingerbread-plus-aosp * commit '156ddd48e9c54012469fed6e7341586e0425c3d2': Add more padding round select boxes, use different assets at
| | * Add more padding round select boxes, use different assets atLeon Clarke2010-10-182-34/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different resolutions, use new assets and don't deform the arrows when stretching the select box. http://b/issue?id=2506670 DO NOT MERGE, cherry pick to GingerBread Bug: 3101402 Change-Id: I21224922db45c1cf4585667d8fa323c6a59dd240
| * | am 7d095dd5: fix the pause() problem...Nicolas Roard2010-10-181-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '7d095dd5f96c8f68593ba0e848e5e26bb3785e5d' into gingerbread-plus-aosp * commit '7d095dd5f96c8f68593ba0e848e5e26bb3785e5d': fix the pause() problem...
| | * fix the pause() problem...Nicolas Roard2010-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | DO NOT MERGE, cherry pick to Gingerbread from master. Bug: 3101402 Change-Id: Ifbdab630badfffa12bc166ac20e804efba16436a
| * | am 3d57c253: Implement the audio tag in webkit -- the corresponding java CL ↵Nicolas Roard2010-10-186-246/+535
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | is https://android-git.corp.google.com/g/#change,41406 Merge commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6' into gingerbread-plus-aosp * commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6': Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
| | * Implement the audio tag in webkit -- the corresponding java CL is ↵Nicolas Roard2010-10-186-246/+535
| | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/#change,41406 Cherry pick to Gingerbread, DO NOT MERGE! Bug:3101402 Change-Id: Idbfb0efcc777f9354fcf88df32105ca9e50a24cd
| * | am f6b396da: DO NOT MERGEShimeng (Simon) Wang2010-10-153-0/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'f6b396da7ac510af40b99ef1f2b0d9063cb8577c' into gingerbread-plus-aosp * commit 'f6b396da7ac510af40b99ef1f2b0d9063cb8577c': DO NOT MERGE
| | * DO NOT MERGEShimeng (Simon) Wang2010-10-153-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For cherry-picking to GB. Implement supportsType in MediaPlayerPrivateAndroid. Use Java API to obtain this info. issue: 3101402 Change-Id: I2baaf8ad861bec9b9b6f92fe753cbd879b33497c
* | | Fixing WebKit APIs affected by Chromium 7.0.540.0 mergeIain Merrick2010-10-199-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebUrlLoaderClient, WebRequest: changing std::wstring to string16 http://src.chromium.org/viewvc/chrome?view=rev&revision=54101 HostResolver parameters changed, fixing WebRequestContext.cpp http://src.chromium.org/viewvc/chrome?view=rev&revision=57189 Icon parameter added to AutoFillHost, fixing AutoFillHostAndroid. http://src.chromium.org/viewvc/chrome?view=rev&revision=54052 Change-Id: If6a17af7da3b80d039205883019e4a73eb35f562
* | | Merge "compute cursor rings when layers are transparent"Cary Clark2010-10-198-145/+511
|\ \ \
| * | | compute cursor rings when layers are transparentCary Clark2010-10-188-145/+511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google search suggestions are drawn in a popup menu (a div with a small amount of transparency). This can partially or complete obscure links underneath the popup, and can present touchable targets which may be much larger than the text contained by the link. CachedRoot::checkRings() determines if a larger bounding box can be used for the ring around the link. CachedRoot::maskIfHidden() determines if the ring needs to be cut down in size because it is only partially visible, or fully obscured. Both routines share the implementation that gathers information about the link, which uses RingCanvas to parse the picture, and RingCheck to build layers describing the text and rectangles drawn in the area around the ring. The basic strategy is to find the text contained by the link under consideration, and see if subsequent drawing obscures the text, or if other text would be enclosed by enlarging the ring. Since maskIfHidden() works better now than before, this CL enabled checking for hidden links when recomputing the current selection after the picture updates. It also checks to see if the link can be larger when maskIfHidden() determines that it is unclipped. Also, if a tap is inside the larger ring, but not on the text itself, treat that as a valid hit. (In CachedFrame::findBestHitAt) And, this fixes CacheBuilder debugging code, and the CacheBuilder array crasher described by bug: 3043268 bug: 2661613 Change-Id: I751f6539f6c840889a58de8c4611364442b3e37c
* | | | Merge "Fix books.google.com purchase page."Patrick Scott2010-10-183-7/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Fix books.google.com purchase page.Patrick Scott2010-10-183-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to copy the data between threads. Bug: 3105145 Change-Id: I955d033815aaf3fd18fdac52ab8cf9b23c107436
* | | | Make sure the focus node is an HTMLInputElement before checking whether it's ↵Steve Block2010-10-181-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a password field Bug: 3105611 Change-Id: I9190b50265d3b1ea9639dbdae1d513aefb93c9f3
* | | | Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"Steve Block2010-10-1810-37/+37
|\ \ \ \ | |/ / / |/| | |
| * | | Rename DeviceOrientationManager to DeviceMotionAndOrientationManagerSteve Block2010-10-1510-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires a corresponding change in frameworks/base ... https://android-git.corp.google.com/g/74335 Change-Id: I8158a8a65e83fa1d0a80233250921dae2c2b4d76
* | | | Merge "Add new keycodes."Jeff Brown2010-10-151-0/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Add new keycodes.Jeff Brown2010-10-141-0/+53
| | | | | | | | | | | | | | | | | | | | Bug: 2912307 Change-Id: I8560879fa057af7a3193233db45506d1d4d419a0
* | | | Rename to_string() to jstringToWtfString() for greater claritySteve Block2010-10-1513-70/+70
| | | | | | | | | | | | | | | | Change-Id: I8516c4f39a38e236d0bff38a91fe8657cfcf8ad4
* | | | resolved conflicts for merge of 1457b739 to masterKenny Root2010-10-144-5/+42
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I5e5460ec4afde9a229c3f73255f4d40322eb7166
| * | | am e228a64d: Merge "Provide padding + border values for textfields." into ↵Cary Clark2010-10-134-7/+44
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'e228a64d32a6c1f9d88cf43529f69792207585dd' into gingerbread-plus-aosp * commit 'e228a64d32a6c1f9d88cf43529f69792207585dd': Provide padding + border values for textfields.
| | * | Merge "Provide padding + border values for textfields." into gingerbreadCary Clark2010-10-134-7/+44
| | |\ \
| | | * | Provide padding + border values for textfields.Leon Scroggins2010-10-124-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3085564 They are used by WebView.java to align the WebTextView's text positioning with the page below. This allows the selection and insertion arrow handlers to line up better with the actual selection on the page. Requires a change in frameworks/base: https://android-git.corp.google.com/g/#change,73565 Change-Id: Ia100286016a780abd5f30e32975f8ad566a6ed74