summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/BrowserFrame.java
Commit message (Collapse)AuthorAgeFilesLines
* Delete the old WebView.Torne (Richard Coles)2013-10-151-1351/+0
| | | | | | | | | Delete all the Java classes used only by the old WebView implementation, and also sections of common classes that were only needed for the old WebView. Bug: 10427705 Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d
* resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-291-2/+2
|\ | | | | | | Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
| * Track change to JSSE providerKenny Root2013-04-291-2/+2
| | | | | | | | Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
* | am d152f7ec: Merge "Don\'t use X509CertImpl directly"Kenny Root2013-04-291-7/+10
|\| | | | | | | | | * commit 'd152f7ec1ae43d77ff8e2206724ce71da3da9913': Don't use X509CertImpl directly
| * Don't use X509CertImpl directlyKenny Root2013-04-291-7/+10
| | | | | | | | Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
* | Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly ↵Kristian Monsen2013-04-261-2/+5
|\ \ | | | | | | | | | starting in JWR22B" into jb-mr2-dev
| * | Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in ↵Kristian Monsen2013-04-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | JWR22B Catching all excptions from reading from the AssetManager Change-Id: I53f99484deda3778307eab2ae86ca9fc0ad2fead
* | | am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am ↵Selim Gurun2013-04-201-10/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" * commit 'a68545796da33bd7fde616958e6abc7548d0a975': Revert "Add a delimiter between scheme and host"
| * | am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am ↵Selim Gurun2013-04-201-10/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" * commit 'fa1f7d21e97b7225f1e7553abc0eebe06cc79367': Revert "Add a delimiter between scheme and host"
| | * \ am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-201-10/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '679c8f689f6799d143719bb8eb839e2640bf9d07': Revert "Add a delimiter between scheme and host"
| | | * | Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-041-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8 Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
| * | | | am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT ↵Geremy Condra2013-04-191-2/+8
| |\| | | | | |_|/ | |/| | | | | | | | | | | | | | | | | | MERGE Merge commit \'8225df00\' into bp * commit '30504327364a7ad641c09a227f7930b9fba91614': Add a delimiter between scheme and host
| | * | DO NOT MERGE Merge commit '8225df00' into bpGeremy Condra2013-04-181-2/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Add a delimiter between scheme and host Bug: 6923539 Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
| | | * Add a delimiter between scheme and hostSelim Gurun2013-04-011-5/+10
| | | | | | | | | | | | | | | | | | | | Bug: 6923539 Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
| | | * DO NOT MERGE Control access to inherited methods of jsinterface objectsSelim Gurun2012-10-091-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7073422 Create the plumbing to use an annotation to allow access to inherited methods of jsinterface objects. The default webview behavior has not changed yet. However internally an a flag is introduced to restrict javascript access to methods that have an annotation. Clean cherry pick of 94740e6c333a109be7516abbd17dd418f23b4f0c Provided @JavascriptInterface to methods that are accessible from js. Clean cherry pick of b743a23fc5bce9965c1539c3c8611614424a5aff Add a glue logic to require use of annotations in injected accessibility objects. Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
| | | * DO NOT MERGE remove defunct javascript interfaceSelim Gurun2012-10-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7073422 The feature that is using search box implementation was removed from browser after Honeycomb. This is to remove the js interface that is added for this feature. Clean cherry pick of d773ca8ff2a7a5be94d7f2aaa8ff5ef5dac501a8 Change-Id: I033d29718d08803f375759faf83e2058df6d4906
| | | * Get a WebViewDatabaseClassic instance lazily. Do not merge.Ben Murdoch2012-06-011-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than caching the WebViewDatabaseClassic instance in a member, grab the instance when we need it. In the case of WebSyncManager - neither it or it's subclass uses the WebViewDatabaseClassic (and it's subclass is final) so remove it's initialisation. We must leave the member declared however to satisfy the published API. Bug: 6482144 Change-Id: Ibf5186a2851d17f5ad62b35ad543aeadff5618d9
* | | | Add a delimiter between scheme and hostSelim Gurun2013-03-081-2/+8
| | | | | | | | | | | | | | | | | | | | Bug: 6923539 Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
* | | | am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs ↵Brian Carlstrom2013-03-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | instead of ints to store pointers in OpenSSL binding" * commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd': Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
| * | | Tracking libcore change to use longs instead of ints to store pointers in ↵Brian Carlstrom2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | OpenSSL binding Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5
* | | | am a6472811: am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for ↵Kenny Root2013-01-251-8/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSLKey" # Via Android Git Automerger (2) and others * commit 'a647281109584d96ba2265c0faa14432deeb9815': Track libcore changes for OpenSSLKey
| * | | Track libcore changes for OpenSSLKeyKenny Root2013-01-221-8/+5
| |/ / | | | | | | | | | Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
* / / Remove CacheManager implementationBo Liu2012-10-241-2/+0
|/ / | | | | | | | | | | | | CacheManager will not be implemented with webviewchromium. So removing existing implemntation in WebViewClassic. Change-Id: I82d3a156ba898393cc12080f8150841cd76f187a
* | Fix perf regression from scale/density mismatchJohn Reck2012-09-271-1/+1
| | | | | | | | | | | | Bug: 7242941 Change-Id: I8a45e8ae589cecc6215566b995003b9eefb7827e
* | Remove defunct searchbox implementation from webview.Selim Gurun2012-09-111-9/+0
| | | | | | | | | | | | | | The search box implementation has not been in use since ICS. This removes dead code from webview. Change-Id: I8a28eeeec556619abc4a902a3abec2ac52bad319
* | Control access to inherited methods of jsinterface objectsSelim Gurun2012-09-101-12/+42
| | | | | | | | | | | | | | | | | | | | | | Bug: 7073422 Create the plumbing to use an annotation to allow access to inherited methods of jsinterface objects. The default webview behavior has not changed yet. However internally an a flag is introduced to restrict javascript access to methods that have an annotation. Change-Id: I41927248e6bc4b09d17c0707c60fe5e6ab681e66
* | remove defunct javascript interfaceSelim Gurun2012-09-051-3/+0
| | | | | | | | | | | | | | | | | | | | Bug: 7073422 The feature that is using search box implementation was removed from browser after Honeycomb. This is to remove the js interface that is added for this feature. Change-Id: I9441d461caf189467e4ad45de958c13b81f4ff17
* | Provide referer to browser on download request.Selim Gurun2012-08-291-2/+2
|/ | | | | | | | | Bug: 6662557 Provide a private API to provide referer to browser for download requests. Change-Id: I6ff393caa43e16db12fb5dab38f1f26cd76bf232
* Use private key context when necessarySelim Gurun2012-05-041-5/+22
| | | | | | | | | | | Bug: 6249185 Due to recent changes to keystore, we cannot rely on encoded key format anymore. Rather we receive the key context (a pointer to private key really) and pass it to native openssl. We also keep the original logic however. Change-Id: Iefe9f0336dd5f47eec4222fcb6fec58807e7cac0
* Create WebViewDatabaseClassic from WebViewDatabase.Ben Murdoch2012-04-261-6/+5
| | | | | | | | | | | | WebViewDatabase has a getInstance() method, so similarly to WebStorage, WebIconDatabase etc we refactor it into a proxy class, and move the current implementation into WebViewDatabaseClassic. Also clean up some JavaDoc in touched files. Bug: 6234236 Change-Id: I71cbd8f78e60f396e96e8546073ad634797cce15
* Tidy up usage of URLUtil constantsJonathan Dixon2012-03-281-10/+3
| | | | | | | | | | Several of these are duplicated; referring to a single source makes the code paths using them easier to track down. (also removing a spurious import) Bug: 6237833 Change-Id: Ibdacc124c047e37c7f0ced9ecc6f26ae3e6b4326
* Rename getWebView() to getWebViewClassicJonathan Dixon2012-03-211-2/+2
| | | | | | | | | | | | Interdepends on https://android-git.corp.google.com/g/170037 Tidys up a TODO from my webview proxy patch. This allows me to re-introduce getWebView(), but now returning the actual WebView instance which is needed by my upcoming change to WebKit linked above. Also moves sendPluginDrawMsg() to WebViewCore for convenience in the MediaTexture code that calls this. Change-Id: I57b72504a792de58d15f386abf4a9d821449ab0a
* Fix file path calculation for asset files.Selim Gurun2012-03-141-1/+2
| | | | | | | Bug: 6019611 filter out query params and URI fragments from file path. Change-Id: Ia5892490a5ffa89d82b52c2a5e6956a244566a4a
* Refactor WebView to be a thin proxy classJonathan Dixon2012-03-021-2/+2
| | | | | | | | | | | | | | | | Splits interface and implementation; all client calls are forwarded to an abstract WebViewProvider interface, and the existing implementation moved into the WebViewClassic implementor of this interface. Originally taken from a snapshot from the development branch, by: git diff HEAD 9a4c328a54cc05e5 | git apply - but then rebased to keep up to date with master Interdepends on webkit and Browser changes: https://android-git.corp.google.com/g/158979 https://android-git.corp.google.com/g/167911 Change-Id: I91403f32654ff308934e95c832d17b292a7d9b2e
* Drop support for Android HTTP stackSteve Block2012-02-221-111/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All future releases will use the Chromium HTTP stack and maintaining two HTTP stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we now use V8 in all build targets (b/5495373), so we can safely drop the Android HTTP stack. LoadListener, HttpAuthHandlerImpl, Network, SslErrorHandlerImpl, WebViewWorker - Android-stack specific, removed StreamLoader, FrameLoader - Require LoadListener, removed CacheLoader, ContentLoader, DataLoader, FileLoader - Extend StreamLoader, removed BrowserFrame - Removed methods that create LoadListener - BrowserFrame.startLoadingResource() is called from native CallbackProxy, WebView - Removed calls to Network methods CacheManager, CookieManager, CookieSyncManager, WebViewCore, WebResourceResponse - Removed other Android-stack specific code JniUtlil - Removed useChromiumHttpStack() WebViewDatabase - Removed all code to create cookies and cache databases for Android HTTP stack See corresponding WebKit change https://android-git.corp.google.com/g/166327. Bug: 5495616 Change-Id: If491675516f6eb187077af4220214bb6e6a8d045
* Remove unused cache methodsSteve Block2012-02-221-9/+0
| | | | | | | | | | | | | | | | | | | These were added in https://mondrian.corp.google.com/changelist/19077-p9. CacheManager.setCacheDisabled() has been unused since https://mondrian.corp.google.com/changelist/20678-p9 (see change to WebView), so the WebKit cache is always enabled. BrowserFrame.setCacheDisabled() has been unused since https://mondrian.corp.google.com/changelist/33679-p9, so the WebCore cache is always enabled. BrowserFrame.CacheDisabled() has been unused since https://mondrian.corp.google.com/changelist/32803-p9 (see change to WebView). See WebKit change https://android-git.corp.google.com/g/167298. Change-Id: I68bf334f4a34df1b88d2b5204e50c2eb04db7e69
* Fix Apache stackJohn Reck2012-01-041-0/+1
| | | | Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
* Do not allow file:// access when it is disabled.Ben Murdoch2011-12-161-0/+7
| | | | | | | | If WebSettings is configured to disallow access to file:// URLs, then block them. Bug: 5773763 Change-Id: If2793f31cb37e0d3af15cb18e818bfa4058167fd
* Merge "Move ssl callbacks to webcore thread."Selim Gurun2011-12-131-2/+10
|\
| * Move ssl callbacks to webcore thread.Selim Gurun2011-12-131-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4586251 Original CL was for ics-mr1. We decided it should be in master instead. Original CL https://android-git.corp.google.com/g/154083 Current ssl cert logic makes callbacks to webkit from the UI thread. This is not right. Move the callbacks to proper thread. Change-Id: Ie3de7dbaed7780dbb6cf537ca1d29686d867b784
* | Clear the WebView picture when a new load starts.Ben Murdoch2011-12-071-0/+1
|/ | | | | | | | Clear the old picture set when we have confirmed a new page load. Bug: 5701197 Change-Id: Id96fb7d8e75a0b54a448d35239a69ba1774cffae
* Set the initial scroll position for RTL.George Mount2011-11-091-0/+13
| | | | | | | | | | Bug 5268793 Webkit knows about the correct initial position for web pages. On initial show, scroll to the webkit position. External WebKit CL: I6a91b97f Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
* Remove unnecessary memory allocationsJohn Reck2011-11-071-7/+0
| | | | | | | Bug: 5581637 Also delete some dead, unused code Change-Id: If6efd11f5032141dadbfcd0b3215e89b464e5f35
* Modify BrowserFrame.requestClientCert() to take the host and port as a StringSteve Block2011-10-121-8/+6
| | | | | | | | | | | | | Currently we get the host and port from Chromium as a std::string, convert to a jbyte array to pass over JNI, then convert to String. It's simpler to convert directly to jstring and to pass that over JNI. Requires https://android-git.corp.google.com/g/141234 in external/webkit. Bug: 5442710 Change-Id: I5480471a841c24481ef09d836a8b0c778251b119
* Add WebViewClient.onProceededAfterSslError()Steve Block2011-10-071-1/+4
| | | | | | | | | This is used to notify the host application that an SSL error occurred while loading a resource, but the WebView but chose to proceed anyway based on a decision retained from a previous response to onReceivedSslError(). Bug: 5403366 Change-Id: I51a25b93d7824b7eb7b6d5a961cba948e37c85db
* SSL-related cleanup in BrowserFrame and SslCertLookupTableSteve Block2011-10-051-4/+1
| | | | | | | | | | | - Fix a comment in BrowserFrame.certificate() - Simplify SslCertLookupTable by not storing 'deny' decisions. We only need to store 'allow' decisions, as we don't re-use 'deny' decisions. No change in behaviour. Bug: 5409251 Change-Id: I447cd1966fbb6c2dea8088b2e4c4e2de22405cb9
* Fix BrowserFrame to construct SslError using the full URL, rather than the hostSteve Block2011-10-051-7/+1
| | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/#/c/133348 changed BrowserFrame to construct the SslError using only the host. This was done so that we match on just the host component of the URL when re-using previous decisions in case of an SSL error. It also means that the browser displays only the host when it shows the SSL error dialog. This change fixes BrowserFrame to pass the full URL to SslError. We modify SslCertLookupTable to keep the existing behaviour regarding matching on only the host component. There's no need to change Browser to continue displaying only the host as I think this change was an unintentional side-effect. Also remove dead code-path in BrowserFrame.reportSslCertError(). This method is used only with the Chromium HTTP stack. This code was added in https://android-git.corp.google.com/g/#/c/121023. No functional change. Bug: 5410252 Change-Id: Ief2dbf4558095fb6fa7ab0caac7d37fa4f640b66
* Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()Steve Block2011-09-271-20/+18
| | | | | | | Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError(). Bug: 5287216 Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
* Relax form autocomplete conditionsBen Murdoch2011-09-091-3/+3
| | | | | | | | | | | | Use the URL host and path rather than the complete url to store form autocomplete data. This helps in the situation that a site uses some dynamic query string on the page that contains the form. Also set the autoocmplete threshold to 1 so that we don't flick the autocomplete options up and down as you type the first few characters. Bug: 5265606 Change-Id: I7b372400062ae34f70a78b786007910dc179b101
* Fix for bug 5100096 Repeated Security WaringKristian Monsen2011-09-071-1/+3
| | | | | | Only giving the host to SslError. Change-Id: I6112643cf25293348ff20193e67da5f52063ffa2
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-30 15:47:09 +0000