summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Add support for file uploads in WebKitKristian Monsen2010-11-045-58/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also moves some of the android file handling to Java so it is not duplicated in both places. This CL needs https://android-git.corp.google.com/g/#change,77400 in frameworks/base Change-Id: I90c1726e6c323a9de3fd64f2e6feef4b64171053
* | | Merge Chromium at r63472 : WebKit fixes.Iain Merrick2010-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium now uses protocol buffers so we need libprotobuf. See http://src.chromium.org/viewvc/chrome?view=rev&revision=63221 HttpCache takes an extra constructor argument. See http://src.chromium.org/viewvc/chrome?view=rev&revision=61789 Change-Id: I5e78b0de9a8ff86040b13212455eb37a4ed0e39e
* | | Update the layers onlyNicolas Roard2010-11-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | C++ counterpart to https://android-git.corp.google.com/g/#change,77500 Bug:2975990 Change-Id: I3b8fd27f991d6776059a15eef36d0c9a7b44f9bb
* | | Fix WebCoreStringToJString() to not delete the local reference to the new ↵Steve Block2010-11-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jstring The JNI spec allows for local objects to be GC'ed before the JNI frame returns, so this is dangerous. Also rename the method to WtfStringToJstring() to match the existing jstringToWtfString() and update call sites to JNIEnv::NewString() to make use of it. Change-Id: I84aa25ba1aca2aee346bf6e3d83a58afc3a95219
* | | Notify WebKit of redirects in the Chrome HTTP stack.Iain Merrick2010-10-293-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this CL we just defer the redirect until WebKit has had a chance to check it, and potentially cancel it. There's a comment in the old code asking what to do if we're given a bad request. Looks like this should never happen; it's a DCHECK in Chrome so I've turned it into an ASSERT here. We only follow redirects if WebKit does not modify the URL (this is the same behaviour as Chrome). Change-Id: I0c8b8cd61c501527a29dda5aca521a7df4a3ccef
* | | Merge "Allow Gmail attachments to be viewed."Iain Merrick2010-10-296-33/+90
|\ \ \
| * | | Allow Gmail attachments to be viewed.Iain Merrick2010-10-286-33/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying attachments, WebKit calls downloadFile() on an Android-specific URL. This was crashing because it expected to have a URLRequest available; however, there's a different code path in WebRequest.cpp for Android URLs that doesn't create a URLRequest. This CL hoists the implementation of downloadFile() into WebUrlLoaderClient, and gets the necessary headers from the WebResponse object in didReceiveResponse (which should always be called before downloadFile). Gmail appends the MIME type to the URL after a ? separator, and we have to extract this to display the file correctly. Tests: - Can display .txt attachments in Gmail (now fixed) - Can download .apk files (checking for regressions) Change-Id: I966220977972da7a2de29e663d7781b1de0e6fd4
* | | | Clear chromium side autofill profiles when java syncs a null profile.Ben Murdoch2010-10-292-0/+18
|/ / / | | | | | | | | | | | | | | | | | | This implements the native code needed to support the deletion of a profile through the editor UI. Change-Id: I7966551324d709612bff7cafeaf8a2cf93c218f0
* | | Use Tasks for WebRequest -> WebUrlLoaderClient callbacks.Iain Merrick2010-10-285-184/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using some hand-rolled boilerplate for inter-thread communication, with all data packed into the same LoaderData struct. This CL uses the Chromium utility function NewRunnableMethod to pack up the parameters, so the callback methods don't have to be static and can have different parameters. Also using smart pointers wherever possible. Testing: manually verified that both synchronous and asynchronous requests work correctly with no leaks. Will also do stress-testing to check for race conditions. Change-Id: I934a2ee795138f8eee43803a94bb7494ee73031d
* | | Merge "Fix a missing namespace in WebCache"Steve Block2010-10-271-3/+5
|\ \ \
| * | | Fix a missing namespace in WebCacheSteve Block2010-10-271-3/+5
| | | | | | | | | | | | | | | | Change-Id: I6d1bf42b3f5a81b24613ca4c62ba4e02400a63b0
* | | | Merge "Hook up CookieManager.acceptCookie() and setAcceptCookie() for the ↵Steve Block2010-10-274-2/+43
|\ \ \ \ | |/ / / | | | | | | | | Chromium HTTP stack"
| * | | Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium ↵Steve Block2010-10-274-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP stack We also update PlatformBridge::cookiesEnabled() to query the Chromium HTTP stack directly. This avoids calling CookieClient::cookiesEnabled(), which calls the Java CookieManager::acceptCookie() which in turns calls back to native code. Also requires a change to frameworks/base ... https://android-git.corp.google.com/g/76065 Bug: 3116410 Change-Id: Id853463f3bcef76b220e8c44dd2b30c0d6752624
* | | | Update playback state after full screen video return.Shimeng (Simon) Wang2010-10-271-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | This change will correctly update the play/pause button when a full screen video is returned in the middle. issue:3102273 Change-Id: Icf5e9194393fa30dd6d9195045df21480842aa6b
* | | Update Chromium HTTP stack to get database and cache paths from ↵Steve Block2010-10-271-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CookieSyncManager Currently these paths are obtained from the BrowserFrame via JNI. However, the paths are not synced to the BrowserFrame until the WebCore thread has started up. This means that if the WebRequestContext is created on the IO thread, the paths may not be available. This change moves the paths from BrowserFrame to CookieSyncManager to avoid the need to wait for the WebCore thread. Note that the new methods may be called on either the UI or WebCore threads, so are synchronised. Requires a change to frameworks/base ... https://android-git.corp.google.com/g/76580 Change-Id: I61f88772d13901d66892118c79db3cac412e6bd1
* | | Fix WebRequestContext::get() to be threadsafeSteve Block2010-10-272-0/+6
| | | | | | | | | | | | | | | | | | | | | This allows the method to be called from both the WebCore thread and the UI thread, as required to hook up CookieManager. Change-Id: I895d14909b14f0baba77fb2cb75926d9103ee01f
* | | Fixes style in WebRequestContextSteve Block2010-10-276-52/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this file used Chromium style, as it extends a Chromium class. However, I think it's best to switch to WebKit style to prevent Chromium style from leaking into the rest of WebKit. Also switches static member methods to file-scope static functions where possible. Finally, return WebRequestContext* rather than URLRequestContext* to allow us to call methods in the derived class. this will be required to hook up CookieManager. Change-Id: Ifdca62230a3728e338904ef1b9b392640af06a92
* | | Only AV formats should be handled by MediaPlayer (C++ side)Iain Merrick2010-10-271-1/+1
| | | | | | | | | | | | | | | | | | Fixing JNI bindings. See Java-side change for details (Id39b770b). Change-Id: I50da7599475476ebaaf9609f44e13fbdf212c90e
* | | Merge Webkit at r70209: ImageColorSpace type no longer exists.Ben Murdoch2010-10-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It has been replaced with ColorSpace. Also DeviceColorSpace has been renamed ColorSpaceDeviceRGB. See http://trac.webkit.org/changeset/70143 Change-Id: Ib603dcef04dcfa51fca142d8b3d03689a18e110f
* | | 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
* | | Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"Steve Block2010-10-221-0/+1
|\ \ \
| * | | Hook up CookieManager.removeAllCookie() for the Chromium HTTP stackSteve Block2010-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-2/+2
|/ / / | | | | | | | | | Change-Id: I1aba39bdcf217bff751e42d2a335cd230b8193f7
* | | Fix debug statements.Patrick Scott2010-10-211-1/+1
| | | | | | | | | | | | Change-Id: Id37bf0a8b5864fea2490bd2dc5d4a1f52bc56c1d
* | | 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-202-6/+7
|\ \ \
| * | | Fix AutoFill after merge to Chromium merge to 7.0.540.0Ben Murdoch2010-10-202-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-207-12/+46
|\ \ \ \
| * | | | Implement file downloads for Chrome HTTP stack (C++ side)Iain Merrick2010-10-207-12/+46
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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 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-181-243/+295
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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-181-243/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'f6b396da7ac510af40b99ef1f2b0d9063cb8577c' into gingerbread-plus-aosp * commit 'f6b396da7ac510af40b99ef1f2b0d9063cb8577c': DO NOT MERGE
| | * DO NOT MERGEShimeng (Simon) Wang2010-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "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
* | | | Rename DeviceOrientationManager to DeviceMotionAndOrientationManagerSteve Block2010-10-152-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Requires a corresponding change in frameworks/base ... https://android-git.corp.google.com/g/74335 Change-Id: I8158a8a65e83fa1d0a80233250921dae2c2b4d76
* | | Support the complete AutoFill profile.Ben Murdoch2010-10-142-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Load all AutoFill profile values from Java. Requires a corresponding change in frameworks/base: https://android-git.corp.google.com/g/#change,74046 Change-Id: I4567d0879f364647b649c0f3c80ce8e32423b371
* | | Merge "Sync autofill profile data from java."Ben Murdoch2010-10-132-20/+19
|\ \ \