Commit Graph

2470 Commits

Author SHA1 Message Date
Steve Block
856d8ac200 am 85061b31: am ff35000c: Merge "Fix JavaDoc style for several WebView classes" into jb-dev
* commit '85061b315f895a0a13657aaefd2d8562658bcc05':
  Fix JavaDoc style for several WebView classes
2012-04-26 13:03:40 -07:00
Michael Kolb
38c846c1be am d5515509: am 77974166: Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev
* commit 'd5515509ef0404c49570d95e37739f6c787cd3da':
  Fix NPE in isPrivateBrowsingEnabled()
2012-04-26 13:03:36 -07:00
Steve Block
ff35000ce1 Merge "Fix JavaDoc style for several WebView classes" into jb-dev 2012-04-26 11:02:32 -07:00
Michael Kolb
13d7c03eb8 Fix NPE in isPrivateBrowsingEnabled()
Bug: 6393286

Change-Id: I1fd9c57b7bd68a9c495cbb0df45a406f83b22b5f
2012-04-26 10:43:08 -07:00
Steve Block
4e584df4ce Fix JavaDoc style for several WebView classes
This fixes the JavaDoc style for the following classes ...
- CacheManager.java
- CookieManager.java
- GeolocationPermissions.java
- WebResourceResponse.java
- WebSettings.java
- WebStorage.java
- WebView.java

In particular, this applies the guidelines at
https://wiki.corp.google.com/twiki/bin/view/Main/APIDocumentation

This should help to ensure that future JavaDoc comments use correct style,
rather than using incorrect style for consistency.

Note that this change does not attempt to improve the content of the JavaDoc
comments. This will be done in later changes.

Bug: 5461416
Change-Id: I79e9b15a8cf3597195d58e154a7eb1bcc462944c
2012-04-26 13:59:52 +01:00
Teng-Hui Zhu
d6c131dc47 Merge "The visiblerect calculation should take view's scaling into consideration" 2012-04-25 09:59:57 -07:00
Teng-Hui Zhu
227036b82b The visiblerect calculation should take view's scaling into consideration
webkit change:
https://android-git.corp.google.com/g/#/c/183080/

bug:5684832

Change-Id: Icac236cb4ff837ee4ba21cf1613da47b56cc3732
2012-04-24 17:00:13 -07:00
Chris Craik
912507928c Merge "Support picture listener correctly in HW webviews" 2012-04-24 14:49:51 -07:00
John Reck
4961295d19 Merge "Use the right timeout" 2012-04-24 14:18:17 -07:00
John Reck
d7156d3f47 Use the right timeout
oops

Change-Id: I667b849af4c5d4fece42e9bcbc5b6b9951b955bb
2012-04-24 14:14:47 -07:00
Steve Block
3aa800b9f9 Add tests for reflection and improve JavaDoc for Java Bridge
Bug: 5461416
Change-Id: Ic339b97a9424d8848f8afd47ba00cbbee4d60c9d
2012-04-24 21:34:42 +01:00
Steve Block
f03f64d810 Merge "Update WebViewClassic JavaDoc to refer to WebView" 2012-04-24 03:22:27 -07:00
Steve Block
406aeb2a9d Update WebViewClassic JavaDoc to refer to WebView
Change-Id: I5152ce82111dc661e5dc723d5c3402f2765b7312
2012-04-24 11:20:29 +01:00
Jonathan Dixon
26ed99f3f5 Merge "static methods in CookieManger call via instance" 2012-04-24 03:01:55 -07:00
Jonathan Dixon
be58c40646 static methods in CookieManger call via instance
This allows CookieManager subclasses to correctly override all behvaior
in the base class.

Bug: 6379925
Change-Id: Ife02db24bc192bc1eabf09e0d64668716786d237
2012-04-24 09:48:28 +01:00
Romain Guy
d4caee0e50 I broke the build after all... here's a fix.
Change-Id: I970715fcff5a74a0ce272654c2ea79e4ab3684bf
2012-04-23 20:44:04 -07:00
Romain Guy
ba6be8a62d Prevent WebView from crashing when detached from the window
Bug #6365056

WebView enqueues a functor in the hardware renderer to handle
animations and this functor is called at a later time by the
hardware renderer. However, the functor was not removed from
the queue when WebView was removed from the window. This could
cause the hardware renderer to attempt to execute an invalid
functor and lead to a crash.

Change-Id: I9d38e80f3fdc5e29d4d0cdfa1e893c251a954508
2012-04-23 20:29:31 -07:00
Jonathan Dixon
003952ba33 Merge "Fix dumprendertree crash" 2012-04-23 10:56:21 -07:00
Jonathan Dixon
03b433c031 Fix dumprendertree crash
This is a quick workaround to get tests running again, will follow up with full fix tomorrow.

Bug: 6379925
Change-Id: I96d6e27bfb8f8cd41ec08845ab0fb1e584dbc9da
2012-04-23 18:51:28 +01:00
Steve Block
b838aef488 Fix use of API level in android.webkit JavaDoc
Bug: 5461416
Change-Id: Id17b10fec6bebc46260db6abe6df5f7d44a711ae
2012-04-23 18:24:29 +01:00
Ben Murdoch
1579a67ee9 Merge "Pause the WebCore thread watchdog at the right time." 2012-04-23 05:52:05 -07:00
Ben Murdoch
cba778dc21 Pause the WebCore thread watchdog at the right time.
There are times when we deliberately put the WebCore thread
to sleep (i.e. waiting for a user to complete a JS prompt or
dismiss an alert). In this case, we don't want the WebCore thread
watchdog to fire. Pause the watchdog before we put the WebCore thread
to sleep and resume it again when the thread wakes up.

Factor out the repeated send/pause/wait/resume code into it's own
function.

Bug: 6366520
Change-Id: I17ecf9d466ce21b25a9e5cb8ff4cb0e5fab7605b
2012-04-23 13:50:03 +01:00
Jonathan Dixon
d3101b1d30 Seperate interface and implementation of 4 WebView classes
GeolocationPermissionsClassic
CookieManagerClassic
WebIconDatabaseClassic
WebStorageClassic

Also creats a WebViewFactory top level class - this remains hidden
for now, as it's currently only used implicitly by the other
public WebView classes to create the provider instances.

Bug: 5626244

Change-Id: Id0ca1c16d8058f31a86414bbc0e8a55db4b907ba
2012-04-23 12:43:02 +01:00
Chris Craik
9e5936bc53 Support picture listener correctly in HW webviews
Change-Id: I0e2c5d8cdf788b3a409efa9ced5d37abb1d169c0
2012-04-20 17:41:04 -07:00
John Reck
ebd477518f Merge "Support fallback action if unhandled key event" 2012-04-20 13:43:00 -07:00
George Mount
70c8723e63 Merge "Add fade-in and fade-out for selection handles." 2012-04-20 11:03:47 -07:00
George Mount
30d773f960 Add fade-in and fade-out for selection handles.
Bug 6083041

Change-Id: Ie48cc2da3cb05df82644d8f3c0a3f1d36ca67162
2012-04-20 10:41:05 -07:00
John Reck
d6b1098e1f Support fallback action if unhandled key event
Bug: 6023055

Change-Id: Ib802c4b9d1b606f9ea7a5081e30c50b5bd78e30c
2012-04-20 10:23:24 -07:00
Selim Gurun
caf7f3d1fc Merge "Add websettings API for file origin policy." 2012-04-19 17:01:21 -07:00
Selim Gurun
0ea6dad65e Add websettings API for file origin policy.
Bug: 6212665

Add the API and change the default behavior for Jelly Bean+.

Change-Id: I9a83f510675023c36e2e72c4a69ad082d8124a23
2012-04-19 16:38:18 -07:00
John Reck
9dd4a6c7a4 Merge "Save and load snapshots async" 2012-04-19 16:18:31 -07:00
John Reck
ee3b562d86 Save and load snapshots async
Bug: 5416822
 The overload of webkitDraw is temporary, but this gets the plumbing
 in place and works correctly

Change-Id: Ib3e23b9a4a1862dd445c8dc68a3936590787a62b
2012-04-19 15:29:32 -07:00
John Reck
675035d774 Merge "Remove code preventing scrollTo(0,0)" 2012-04-19 14:52:34 -07:00
John Reck
cada1ae717 Merge "Allow removing messages before EventHub created" 2012-04-19 11:09:44 -07:00
John Reck
a60a18965e Remove code preventing scrollTo(0,0)
Bug: 5677901
 Also remove a bunch of unnecessary logic around delaying the
 scroll until the page load has completed, as Browser will keep the
 URL bar visible itself

Change-Id: I4b175f4ff1d741b7027a4c98f676764707f57342
2012-04-19 10:50:55 -07:00
George Mount
e3e26c41c3 Allow long press to work on text.
Bug 6351196

Change-Id: I7604ebe70ab58d17b916f92e364343776b66aa3c
2012-04-19 09:57:23 -07:00
John Reck
fd6ad04441 Allow removing messages before EventHub created
Bug: 5421676

Change-Id: Id15b669947bd01d3cc3ba3e9b93175120fa518e8
2012-04-18 17:59:17 -07:00
Michael Kolb
23a2ce1fad Merge "Prevent dialog from invalid context" 2012-04-18 10:40:59 -07:00
Michael Kolb
dfceaf2cdb Prevent dialog from invalid context
Bug: 6346748

Change-Id: Ia65ecc1ecb882b480127aca0034db25a9e51ed3c
2012-04-18 08:37:41 -07:00
John Reck
6849e4dd45 Merge "Add destroyed check" 2012-04-17 13:54:54 -07:00
John Reck
8a7e177bb5 Add destroyed check
Bug: 6350066

Change-Id: Icf077bcf9678a036a669124c27e56e191a935960
2012-04-17 13:32:00 -07:00
John Reck
48ca060e65 Merge "Minor cleanup" 2012-04-17 10:37:41 -07:00
Steve Block
cf6960ed15 Merge "Clean up JavaDoc for WebView.getZoomControls()" 2012-04-17 05:08:04 -07:00
Steve Block
06d268e3ad Clean up JavaDoc for WebView.getZoomControls()
Bug: 5461416
Change-Id: I4f2b5c9e4b4c2b1a38d678cb6756f128670ee490
2012-04-17 12:19:10 +01:00
John Reck
533e69f0be Minor cleanup
Change-Id: Ide35e6cf2abe2b723e6d45e796a21ae135706bf5
2012-04-16 18:08:00 -07:00
George Mount
32f038deab Merge "Check for null mWebViewCore in selectText" 2012-04-16 07:39:01 -07:00
Steve Block
9c6b01a753 Merge "Clean up JavaDoc for WebStorage" 2012-04-16 06:42:36 -07:00
Mikhail Naganov
9f7296af04 Fix javadoc breakage by not linking to now hidden WebView.getZoomControls method.
Change-Id: I770a647b2e6068687530813133847a624ed5aa0d
2012-04-16 14:26:06 +01:00
Steve Block
d099935c52 Merge "Clarify WebSettings comments related to zooming." 2012-04-16 02:25:14 -07:00
Jonathan Dixon
caf97c7db9 Merge "Two WebView API cleanups" 2012-04-16 01:05:06 -07:00