Commit Graph

2188 Commits

Author SHA1 Message Date
Mangesh Ghiware
2ddb4c8509 Merge "Fix issue with site-specific display density getting stuck." 2012-01-09 16:02:21 -08:00
Mangesh Ghiware
6f2db8e755 Fix issue with site-specific display density getting stuck.
This issue was found while investigating b/5328288.

After navigating to a page that specifies target-densitydpi in the
viewport meta tag, this density value wasn't reset to the default value
for a page that didn't.

Change-Id: I1a66dab769026367224ecf4cc28bc033ee97e475
2012-01-09 13:53:01 -08:00
Ben Murdoch
3d00578529 Merge "Prompt the user to terminate unresponsive pages." 2012-01-09 10:41:45 -08:00
George Mount
c0c3025cf2 Fix delete key with ContentEditable fields.
Bug 5806859
 Bug 5795341
 Add a custom InputConnection to capture the deleteSurroundingText
 command and use it to send delete key codes to the WebView for
 single deletes or calling into WebViewCore to delete contents for
 more complex changes.
 Also makes the IME options "normal text" for webkit-based text
 entry.
 Webkit change: Ic938d6fa

Change-Id: I18606014a034194928a61981dc3e2400a7db5fac
2012-01-09 09:19:29 -08:00
Ben Murdoch
e2e2083583 Prompt the user to terminate unresponsive pages.
Run a background "watchdog" thread that will check for
the WebCore thread stopping processing messages (this
can happen if a piece of JavaScript goes into an infinite
loop, for example) and offer to close the WebView app when
it detects such a case, much like the normal system ANR.

Bug: 2563868
Change-Id: Ic74813b1e630d657c340a7017a4b0814071eb041
2012-01-09 17:00:09 +00:00
John Reck
1986ed76d2 Merge "Update WebSettings.PREVIOUS_VERSION" 2012-01-06 16:03:59 -08:00
George Mount
5755d01d2c Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI." 2012-01-06 14:00:30 -08:00
George Mount
427f2e5ac5 Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.
Bug 5827817
 Added a nativeClass parameter to all appropriate JNI methods
 and used it instead of GET_NATIVE_VIEW to reduce JNI overhead.

 Webkit Change: I02004fe1

Change-Id: I49c7ecfd598826ffe78067aab393a24860ce10ef
2012-01-06 13:58:27 -08:00
George Mount
d88f26e3aa Merge "Clean up code using eclipse's automatic cleanup feature." 2012-01-06 09:53:01 -08:00
Jonathan Dixon
5883520fd7 Merge "Make WebView.HitTestResult static" 2012-01-06 02:19:31 -08:00
George Mount
fab67a1532 Clean up code using eclipse's automatic cleanup feature.
Bug 5826249

Change-Id: Iacd233625e144cdc522644aafee424aabd6a7f5d
2012-01-05 15:08:27 -08:00
Teng-Hui Zhu
a4ad2928eb Merge "getDuration can be only called after prepared." 2012-01-05 14:47:01 -08:00
John Reck
777710e504 Update WebSettings.PREVIOUS_VERSION
Bug: 5825937

Change-Id: Idb0982e13ad6790ca71b16ff322864fca135f14e
2012-01-05 11:20:04 -08:00
Teng-Hui Zhu
0d1d30b330 getDuration can be only called after prepared.
bug:5816130
Change-Id: I4f264ef612995bc4f7bc3e378893ed9491423fdc
2012-01-04 17:28:58 -08:00
John Reck
430b1b9b3c Fix Apache stack
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
2012-01-04 09:49:17 -08:00
Steve Block
7b061309fa Merge "Fix AppCache when either no path or an invalid path is supplied" 2012-01-04 05:36:57 -08:00
Ben Murdoch
2853041e6a Merge "Do not allow file:// access when it is disabled." 2012-01-03 02:53:58 -08:00
Jonathan Dixon
02630bfe40 Fix silly comment order error
Incorrectly resolved rebase of my previous two commits...

Change-Id: Ie778774deb7ee0979568ca0a8963db2d72bc7a1a
2011-12-21 18:47:57 +00:00
Jonathan Dixon
19644b613e Make WebView.HitTestResult static
- we can do this, because HitTestResult never had a published constructor
  so the only code that can create it has always lived in this package.
- doing this makes the class design cleaner, and smooths the way for allowing
  the new WebView implementation to deal in these results in contexts where
  the appropriate WebView instance is not readily available.

Change-Id: I9e1f1c0faeb16436b1861aab3c2871a5851dfb54
2011-12-21 14:21:36 +00:00
Jonathan Dixon
e230e54f09 Minor WebView docs improvement
Change-Id: Ib0389be456755fac24ad130edd0dd091d9acfaae
2011-12-21 13:05:27 +00:00
Jonathan Dixon
4cde13a3bb Remove misleading API council comments
Most of these APIs have no intention of being published, at least not in anything like the current form.

Change-Id: I1df3ae00320f909caea8a0d42d50ee7400577635
2011-12-19 16:01:31 +00:00
Ben Murdoch
2c18ede18e Do not allow file:// access when it is disabled.
If WebSettings is configured to disallow access to file://
URLs, then block them.

Bug: 5773763
Change-Id: If2793f31cb37e0d3af15cb18e818bfa4058167fd
2011-12-16 18:15:23 +00:00
Steve Block
92f30c3d5f Fix AppCache when either no path or an invalid path is supplied
The bulk of the change is in to external/webkit:
https://android-git.corp.google.com/g/155448

This part of the change simply adds some optimizations to avoid syncing to
native when not required, and cleans up the JavaDoc.

Bug: 5745181
Change-Id: I0009c1868755fe211ec2dc31bd007d393aabfbe3
2011-12-15 17:46:21 +00:00
Victoria Lease
4d8ea3bcc6 URL-decode tel: URIs.
bug: 5688406

Change-Id: I2e3906c22d02b6333ccad7dba529d44ae572a368
2011-12-14 17:13:47 -08:00
Selim Gurun
4f433d53c9 Merge "Move ssl callbacks to webcore thread." 2011-12-13 10:25:18 -08:00
Selim Gurun
38f3610a29 Move ssl callbacks to webcore thread.
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
2011-12-13 10:08:27 -08:00
Chris Craik
09a71e073a Update tilebenchmark to work with current drawing infrastructure
bug:5062896

depends on external/webkit change: https://android-git.corp.google.com/g/#/c/154840/

- directly discard textures, instead of sending an invalidate through webkit
- better ui on smaller screens
- pass native pointer through jni calls

Change-Id: Icadbf8944edc5a2b1f8dc27bab53ac665c975462
2011-12-12 18:10:53 -08:00
Ben Murdoch
2ff8cc2438 Merge "Clear the WebView picture when a new load starts." 2011-12-12 03:13:46 -08:00
Mangesh Ghiware
66b2ff818b Update computation of reading level scale.
Fixes bug 5726043 (Extra double-tap needed to zoom out to overview mode
on nytimes.com on a Stingray)

Change-Id: I54dc303f4aa81ddc38c234228adc915b9f6749dc
2011-12-08 17:11:16 -08:00
Svetoslav Ganov
ba621bd359 Merge "Make the URL for the JavaScript based screen-reader used by WebView configurable." 2011-12-07 14:38:05 -08:00
Svetoslav Ganov
3ca5a74c17 Make the URL for the JavaScript based screen-reader used by WebView configurable.
The URl from which to inject a screen-reader for WebView accessiblity support should be
configurable because: 1) The accessibility engineering team should be able to point
devices to a staging build of the screen-reader; 2) We would like to be able to change
this URL via the Google services mechanism.

bug:5718543

Change-Id: I3d4d343f1c93e0e0173f04b2912949fe8a3566b9
2011-12-07 14:35:59 -08:00
Bart Sears
63051d71ef am 654ac45c: am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
* commit '654ac45c21b257613957c8c172a3fdff79903fcd':
  Fix WebTextView rings
2011-12-07 11:46:11 -08:00
Ben Murdoch
a62b9632c8 Clear the WebView picture when a new load starts.
Clear the old picture set when we have confirmed a new
page load.

Bug: 5701197
Change-Id: Id96fb7d8e75a0b54a448d35239a69ba1774cffae
2011-12-07 14:16:31 +00:00
John Reck
8463c88ddf Fix WebTextView rings
Bug: 5718531
 Don't scroll the rings and fix the border's alpha

Change-Id: I5e629d2b3b1b2bf4760c01d0f927e3f81949e9bd
2011-12-06 17:38:57 -08:00
George Mount
419204c8fb Merge "Remove inFullScreenMode JNI call during drawGL call." 2011-12-06 08:42:07 -08:00
George Mount
5d3f6e6d25 Remove inFullScreenMode JNI call during drawGL call.
Bug 5629367
 Corresponding WebKit change: Ia6f11636

Change-Id: Icc2fb6b778ce1c9bb4dc216a558652de544028b1
2011-12-05 16:56:16 -08:00
Michael Kolb
7d6d55a69c am cda010d5: am 3124e6f9: Merge "Remove debug log messages" into ics-mr1
* commit 'cda010d556552b533191d8bc90454c99c133549f':
  Remove debug log messages
2011-12-05 16:33:01 -08:00
Michael Kolb
e4e5fef75e Remove debug log messages
Bug: 5713163

Change-Id: Id8d9845f6ecb7dd90ae4cf42bc82d39a148a5700
2011-12-05 14:55:02 -08:00
Michael Kolb
58915ce922 am 32e914fc: am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1
* commit '32e914fc0366401b896f34d60119f92f625e6973':
  set System UI visibility based on MediaController state
2011-12-05 09:28:51 -08:00
Michael Kolb
277cbe5a95 Merge "set System UI visibility based on MediaController state" into ics-mr1 2011-12-05 09:24:25 -08:00
John Reck
4b747570f7 am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
* commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90':
  Fix updateDoubleTapZoom logic
2011-12-02 17:57:29 -08:00
Michael Kolb
c07b678522 set System UI visibility based on MediaController state
Bug: 5494143

    still doesn't remove the buttons in dimmed state,
    but at least dims them correctly

Change-Id: Idcfc10616d31f6ccf8cd84b706a17d048bf505a1
2011-12-02 16:12:02 -08:00
John Reck
059832790d Fix updateDoubleTapZoom logic
Bug: 5698099

Change-Id: I83578e57cf809cbe7781d988302f0925dfddec80
2011-12-01 19:28:41 -08:00
Ben Murdoch
9c8fc9c620 am fc00b6aa: am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1
* commit 'fc00b6aac4a5f9222d36b7db5209bca9b63b55d6':
  Fix crash with HTML5 video.
2011-12-01 09:08:00 -08:00
Ben Murdoch
d3f18b805e Fix crash with HTML5 video.
Add missing check for native HTTP stack inside
CookieManager.getCookie(WebAddress) and
CookieManager.setCookie(WebAddress) - private APIs that now
will throw an exception as the legacy cookie table no longer
exists with WebViewDatabase version 11.

Bug: 5690908
Change-Id: I51ae848d03b04d6021d314dda4a199675e38ab02
2011-12-01 13:43:41 +00:00
Bart Sears
51340e0fb7 am 5a4e807a: am 41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1
* commit '5a4e807af8661d35e27157fa224a8e4db0e66f7c':
  fix position of WebTextView on scrolling layers
2011-11-30 22:33:24 -08:00
Michael Kolb
5da91bd674 fix position of WebTextView on scrolling layers
Bug: 5677828

    depends on CL: 152845

Change-Id: Ia6fce3ef64954d99fe044e801d7f083055c8b880
2011-11-30 16:15:18 -08:00
Chris Craik
267a4b0627 am c649180d: am f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
* commit 'c649180d7c12b0b4bc3c183a6431da26cff74819':
  Send animation start notification back to webkit from ui thread
2011-11-30 10:50:42 -08:00
Steve Block
6a8c48f6aa Merge "Clean up JavaDoc for GeolocationPermissions" 2011-11-30 10:04:37 -08:00
Steve Block
7351adf76a Clean up JavaDoc for GeolocationPermissions
Much of the current JavaDoc for GeolocationPermissions exposes implementation
details which are of no interest to a Java developer. Move these comments out
of the JavaDoc and clean up the text.

Bug: 5461416
Change-Id: I95a68fe15016fadc729d8d857fd69b2c927a5ea9
2011-11-30 18:03:30 +00:00