Commit Graph

2002 Commits

Author SHA1 Message Date
George Mount
67f9d32e5e Merge "Fix monkey NullPointerException" 2011-10-05 15:33:46 -07:00
Steve Block
cfb753a641 Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision" 2011-10-05 14:56:21 -07:00
Nicolas Roard
f270a1521c Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work." 2011-10-05 11:35:29 -07:00
Steve Block
f219f23aec Fix SslCertLookupTable to correctly determine whether we have a valid cached decision
We should only re-use a cached 'allow' decision if the decision ...
- is for the same host
- is for an error which is at least as severe as the current error

Bug: 5409251
Change-Id: Id8516f58c8d23de44e80539ffeaf945be3d2914a
2011-10-05 18:01:54 +01:00
Steve Block
bf52c0ea10 SSL-related cleanup in BrowserFrame and SslCertLookupTable
- 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
2011-10-05 13:32:32 +01:00
Steve Block
270a3c8062 Clean up SslErrorHandlerImpl
- Use assert rather than junit.framework.Assert
- Add some comments
- There's no need for checkSslPrefTable() to call handleSslErrorResponse() as
  we'll never update the table. Instead call
  LoadListener.handleSslErrorResponse() directly.

No functional change.

Bug: 5409251
Change-Id: I0c6cdae43fa966f86f4a6c43b74c2f2a01f60319
2011-10-05 13:28:28 +01:00
Steve Block
fa03f9a346 Fix BrowserFrame to construct SslError using the full URL, rather than the host
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
2011-10-05 13:16:17 +01:00
Nicolas Roard
dc221e01ff Streamline the layers update codepath.
Directly update the layers transform and position.
This makes updates faster and less dependent on other webkit work.

bug:5218173
Change-Id: I5f784ef64eda1be3cee406aa23702e5378c8de9e
2011-10-04 17:57:59 -07:00
John Reck
213478b858 Merge "Hardware accelerated button focus rings" 2011-10-03 15:01:10 -07:00
George Mount
1fa26cbfc8 Fix monkey NullPointerException
bug: 5385775
 Check mWebViewCore has been destroyed
 Remove mWebTextView from WebView when WebView is destroyed
 Clear WebTextView's handler when it is removed from WebView

Change-Id: I9c62292d693109e692c341e3e4dba3e04af81fe4
2011-10-03 14:40:52 -07:00
John Reck
bdfb3c5a69 Hardware accelerated button focus rings
Bug: 5353510

Change-Id: Ie6a2c509b5890d3d091465a36804648999228553
2011-10-03 14:14:33 -07:00
Adam Powell
f8419a0299 Fix bugs around overlay action modes.
Multiple focusable windows cause undesired behavior around selection
modes. TextView isn't sure how to behave when it loses window focus
with regard to selection handles and action modes need to be focusable
for WebView find on page since it uses an EditText as a custom view.

For now:

* Use a layered window decor for overlay action mode when there is no
  action bar requested. This eliminates an extra window and avoids the
  issue described for full-screen UIs.

* Disable WebView's find-on-page mode when the action mode's UI will
  not be focusable. This only affects WebViews in floating windows.

Also remove the "Text Selection" title for WebView's selection mode at
UX's request, as it is inconsistent with TextView's selection mode and
the string does not fit on phones in portrait even on wide
devices. This now uses the same mechanism used in TextView to decide
whether to use title text.

Change-Id: I80caeecea9b47728cf26bb0a388153ca0bdeafe1
2011-10-03 13:20:23 -07:00
Russell Brenner
b76b3b1c81 Center box text vertically
Apply Gravity.CENTER_VERTICAL for single-line editable text

Bug: 5267547
Change-Id: Ie81354214e6eb97554d1f9e8e47377a2b0e73df6
2011-09-30 17:03:32 -07:00
Mangesh Ghiware
293fe94920 Merge "Force a WebView pictureset reset on screen rotation." 2011-09-29 15:57:51 -07:00
Mangesh Ghiware
e8b05e858a Force a WebView pictureset reset on screen rotation.
This fixes some stale content issues when rotating the screen.

Bug: 5357237
Bug: 5361852
Change-Id: I574dac15dbb1a35a8830377848f38ba2b766f095
2011-09-29 13:41:34 -07:00
Steve Block
29af074436 Merge "Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread" 2011-09-29 04:09:45 -07:00
John Reck
55b039f1b7 Merge "Support for correctly scaling text selection handles" 2011-09-28 11:11:57 -07:00
Steve Block
0a20d6a4c3 Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 2011-09-28 10:11:55 -07:00
Steve Block
85aa944888 Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread
Bug: 5384494
Change-Id: I2587cf0e898f67becb9dbc2067fb1b0a6a37e124
2011-09-28 14:39:41 +01:00
Steve Block
aae19fb90c Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack" 2011-09-28 02:45:28 -07:00
Steve Block
a0d767c822 Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set
This makes sure that the page's SSL certificate is cleared when the page load
starts.

Follows on from https://android-git.corp.google.com/g/#/c/138147.

Bug: 5287216
Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
2011-09-28 10:44:11 +01:00
Kristian Monsen
d9151bf1cc Hook up WebView.clearSslPreferences() for the Chromium HTTP stack
Note that this is an incomplete fix, as we do not clear the responses for
connections currently in use, as they maintain their own cache. See
http:/b/5324235.

Bug: 5287216
Change-Id: I18f6638efeff0bee1e7ffed606be1444d683bebd
2011-09-28 10:44:11 +01:00
John Reck
1cfe8ddf62 Support for correctly scaling text selection handles
Bug: 5367280

Change-Id: If32fdc9cd82d1a66bc96446a123c44d9edd9d340
2011-09-27 20:14:39 -07:00
Steve Block
a3b06ff933 Merge changes If97c4d76,I1cd975b1
* changes:
  Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
  Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
2011-09-27 10:52:50 -07:00
Steve Block
9a0cd15eec Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
This looks like a copy-paste error from other CallbackProxy methods which call
back to the WebViewClient or WebChromeClient, rather than the WebView.

Also remove '@hide' annotations. These are superfluous as the class is not
public.

Bug: 5287216
Change-Id: If97c4d769cf82563b9c182ba09fc742fbb7e08e9
2011-09-27 16:42:51 +01:00
Steve Block
200ff0a7b1 Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError().

Bug: 5287216
Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
2011-09-27 16:42:45 +01:00
Teng-Hui Zhu
fb2fd5f52c Double check the permission before setting the Wake Lock
bug:5361732
Change-Id: Ia9092b25d62c4a14cba885f5e3fac0326d0fde1c
2011-09-26 17:36:11 -07:00
Steve Block
2cdbe2f1cf Merge "Update the error for WebView thread violations to make clear that it's not fatal" 2011-09-26 08:41:09 -07:00
Steve Block
7a01d94c5e Update the error for WebView thread violations to make clear that it's not fatal
- Update the description
- Use Throwable rather than RuntimeException
- Log as a warning rather than an error

Bug: 5313494
Change-Id: If13ce2088e7080122db14e5e0565f64e6d6f4320
2011-09-26 14:59:12 +01:00
Ben Murdoch
e0b0578a1e Merge "Force a WebView pictureset invalidation on screen rotation." 2011-09-26 06:19:56 -07:00
Ben Murdoch
9bb55bf015 Force a WebView pictureset invalidation on screen rotation.
This fixes some stale content issues when rotating the screen.

Bug: 5357237
Change-Id: Ib41a659ec99419cdf94ad5321c224a33b1f21359
2011-09-23 19:59:53 +01:00
John Reck
2df8f425f6 Add detail to restorePicture deprecation
Bug: 5361506

Change-Id: I4bf6583170df50b218051f4700700ff1b8874d17
2011-09-23 09:27:01 -07:00
Mangesh Ghiware
faab93d1ac Use overview scale when restored scale is 0.
If restored scale and text wrap scale are set to 0 (meaning the previous
scale wasn't saved), set them to overview and reading level scale
respectively.

Bug: 5230909
Change-Id: If7724e9a0cd948c88d0a001728266a3282083bdc
2011-09-21 14:57:11 -07:00
Ben Murdoch
f9580d594a Merge "Cleanup for bug 5278763" 2011-09-20 10:32:28 -07:00
John Reck
2210fff475 Merge "Bringing back the 'cache" 2011-09-19 11:07:28 -07:00
John Reck
0966dd22ec Bringing back the 'cache
Bug: 5333083

Change-Id: I9b693ad0a0d4ee2979a7dabad6575ffada962b16
2011-09-19 09:12:27 -07:00
John Reck
c99e447ea7 Don't switch to handle drag mode when starting selection
Bug: 5327408

Change-Id: Ibda37b1a661d9cdc80a86bc16488178b69fac4a2
2011-09-16 13:23:43 -07:00
John Reck
5dd1916c24 Merge "Fix text selection drawing on SW" 2011-09-16 10:39:16 -07:00
John Reck
57efcffc7f Fix text selection drawing on SW
Bug: 5312770
 Helps if you actually draw stuff...

Change-Id: I5ab8cd0726cac77a91fb476c7db0873132ba91d9
2011-09-15 13:52:38 -07:00
John Reck
5540abcdef DO NOT MERGE Fix finalization
Bug: 5321358
 Destroy does run with this. Ideally we should get rid of the need
 to run this on the UI thread at all. GL destroy should instead
 take place when the view is detached or something like that.

 Cherry picked from master

Change-Id: I693ce83cd607186173d8cf58485c5df28004e52c
2011-09-15 11:08:00 -07:00
Adam Powell
ad804e34b9 Fix bug 5321195 - Starting WebView text selection with long press does
not invoke haptic feedback

Change-Id: I6ba6b7e5b0ecedf721ab6d1bf87d7d2a92dc7200
2011-09-14 19:11:08 -07:00
Adam Powell
f4f520ae9f Fix bug 5314559 - Slow menu scrolling in browser on some devices
nativeSetIsScrolling has other side effects. Just pause picture
updating when WebView loses focus.

Change-Id: I917851c806f35a91a12a25c7457712123669384f
2011-09-13 20:16:32 -07:00
John Reck
d4fdc0f562 Merge "Prevent pause/resuming a destroyed WebViewCore" 2011-09-13 17:23:11 -07:00
Adam Powell
911d63d159 Merge "Fix bug 5309557 - Monkeys and SIGSEGV do not mix!" 2011-09-13 17:15:46 -07:00
Adam Powell
cc2264fe47 Fix bug 5309557 - Monkeys and SIGSEGV do not mix!
Make sure that the native component of WebView has been initialized
before any native-level optimization involving window focus occurs.

Change-Id: I24ca5fe21657aeb1a1faf5bc36fba5ea11064f86
2011-09-13 16:11:29 -07:00
John Reck
2f4d30a2a6 Prevent pause/resuming a destroyed WebViewCore
Bug: 5246901

Change-Id: I697cd26b74ffb0584bb992d8caa6bae1e6eee0fd
2011-09-13 15:50:41 -07:00
John Reck
b9376464ab Make sure the finalizer destroy runs on the UI thread
Bug: 5208786
 The finalizer runs on its own thread, but destroy must be called
 on the UI thread

Change-Id: I01ddd675b8aea49aa4e212693551e808a83e45d5
2011-09-13 14:38:22 -07:00
Adam Powell
e00e8a7837 Pause WebKit drawing when WebView loses window focus.
This prevents animations and other live page content from consuming
too many resources while the user is interacting with a popup window.

Bug 5300522

Change-Id: I40fb6d16d56b540c431172052a1ae7fead7109be
2011-09-12 18:04:00 -07:00
Mangesh Ghiware
fa0d2316f9 Merge "On zoom to overview, reflow text, if necessary." 2011-09-12 09:46:49 -07:00
Kristian Monsen
87af7314d4 Cleanup for bug 5278763
Variable is not needed, and removing unneeded check

Also throwing an exception if sContext gets set to null.

Change-Id: Ic61ba4c88a162eb730e166f0e9f477e809b51f42
2011-09-12 16:12:50 +01:00