Commit Graph

2643 Commits

Author SHA1 Message Date
Jonathan Dixon
65ae8d8705 Merge "Extract WebView Classic details from API classes." 2012-06-08 13:53:05 -07:00
Jonathan Dixon
57217f238e Merge "Separate interface and implementation of 2 more WebView classes" 2012-06-08 13:52:33 -07:00
Jonathan Dixon
73eeb7b5ed Extract WebView Classic details from API classes.
Last remaining bits:
- push JNUUtil.setContext call down into WebViewDatabaseClassic
- remove references to hidden ClientCertRequestHandler from the public API classes.

Change-Id: I9605dc2493b73fe8f22c7bb38c73d36632e0c7fa
2012-06-08 11:33:39 -07:00
John Reck
8d79d27275 am b4760127: am 839fd414: Merge "Eliminate gap between finalize() and destroy()" into jb-dev
* commit 'b47601279f8d5170d2beaaf7c1e8c9a713a972da':
  Eliminate gap between finalize() and destroy()
2012-06-07 17:21:42 -07:00
John Reck
5c25762bcf am 13b9d282: am 0e0ce11e: Merge "Stay in layer scroll if nothing to scroll" into jb-dev
* commit '13b9d28268d76b886be0a8cbd15a1d059c276d6b':
  Stay in layer scroll if nothing to scroll
2012-06-07 17:21:35 -07:00
John Reck
839fd4144e Merge "Eliminate gap between finalize() and destroy()" into jb-dev 2012-06-07 15:57:56 -07:00
John Reck
919c89e204 Stay in layer scroll if nothing to scroll
Bug: 6628376
 The issue here is that contentX & contentY can both be 0 if we are scrolling
 slowly enough as they are adjusted by the page's scale and can thus round down.
 However, this would result in us falling out of layer drag mode even though
 we haven't tried to scroll past the edge of the layer. Detect this case, and
 stay in layer scroll mode.

Change-Id: I3c655d0d03e8f89887abbe718bd24699c133ee1a
2012-06-07 14:45:34 -07:00
John Reck
d5e2937933 Eliminate gap between finalize() and destroy()
Bug: 6569073
 Only nativeDestroy and nativeStopGL need to be called on the UI thread,
 so split up destroyImpl into 3 functions, and only have the native
 destroy be pushed to the UI thread if necessary. Also make the work that
 is delayed be static without references to the finalizing WebView to allow
 it to be fully deleted immediately after finalization.

Change-Id: I4e424051e69df0bc409af95ca3f3d2b9e58a6b75
2012-06-07 13:14:57 -07:00
Chris Craik
d2ce0bc723 am 0df6d579: am 37e0c368: Merge "Revert "Add temporary functor detach logging"" into jb-dev
* commit '0df6d579dbe509c2d520c6f163ff2bafbd801208':
  Revert "Add temporary functor detach logging"
2012-06-06 17:05:13 -07:00
Chris Craik
37e0c3681e Merge "Revert "Add temporary functor detach logging"" into jb-dev 2012-06-06 16:59:01 -07:00
Chris Craik
aa3b7d88ef Revert "Add temporary functor detach logging"
bug:6608646

This reverts commit f98851ab37
2012-06-06 16:45:53 -07:00
George Mount
6b1e614f70 Merge "Fix scrolling behavior for text input and textarea." 2012-06-06 16:32:40 -07:00
George Mount
c6c83ce475 Fix scrolling behavior for text input and textarea.
Bug 6614784

Change-Id: I562a20e4cb07250794fc017e6d8b3885f7e8d6b8
2012-06-06 14:57:01 -07:00
Jesse Greenwald
fcc1f75bdf Separate interface and implementation of 2 more WebView classes
WebBackForwardList
WebHistoryItem

Bug: 5626244
Change-Id: Ia7f4b4487a103d8c897ac60d9f01a94e2458b034
2012-06-06 14:18:43 -07:00
Mangesh Ghiware
c1892e0c29 am f8e99204: am b215726a: Merge "Remove transient and unnecessary update density message." into jb-dev
* commit 'f8e99204c901d1d05960ed9a11c6af4a4e7dccd8':
  Remove transient and unnecessary update density message.
2012-06-06 08:41:28 -07:00
Mangesh Ghiware
c7ad10201b Remove transient and unnecessary update density message.
On a page load, the (viewport) metadata settings for the main frame are
reset. Reloading a page with viewport meta tag specifying target density
dpi will result in 2 back to back update zoom density messages to be
sent from WebViewCore to UI thread.

In setupViewport(), remove update density messages in flight. If the new
density is indeed different from WebView's default scale, queue another
message.

Bug: 6509512
Change-Id: I195e40277bf1bcccb0e61d84ed84db1e34556243
2012-06-05 18:46:10 -07:00
John Reck
1f1f21aaa8 am f671e430: am 804e822c: Merge "Fix logspam" into jb-dev
* commit 'f671e430159425ea1ce323f5eb0f59452b1a6fe1':
  Fix logspam
2012-06-05 16:56:38 -07:00
John Reck
eba5e7ddfb Fix logspam
Bug: 6508832

Change-Id: I3061917ae7eba31723c006b1d30d20b7134890b8
2012-06-05 13:22:40 -07:00
Chris Craik
fe952ba031 am 9238e5b9: am ca5a1489: Merge "Add temporary functor detach logging" into jb-dev
* commit '9238e5b9dbfaedd9dbaac9aff1f96bb190220c45':
  Add temporary functor detach logging
2012-06-04 15:59:10 -07:00
George Mount
a419a06e53 Merge "Support selections within scrollable text areas." 2012-06-04 14:48:18 -07:00
George Mount
6787dd2747 Merge "Change from left/right to base/extent for selection handles." 2012-06-04 14:47:53 -07:00
Chris Craik
f98851ab37 Add temporary functor detach logging
bug:6596807
Change-Id: I22342079cdf238a933d62e9cbef58bc5af80522b
2012-06-04 13:42:33 -07:00
George Mount
f1c00f9021 Support selections within scrollable text areas.
Bug 6557816
 Change text selection to modify only the base or extent, not
 both points of the selection.

 Webkit Change: I9a08633160eeb14d5c45246c6128aa02c1642e8d

Change-Id: I355b21e9062b5d364cfb278fda239a4ecdff16d1
2012-06-04 12:26:27 -07:00
George Mount
b49f2bb5dd Change from left/right to base/extent for selection handles.
Bug 6557816
 This is a step in preparation to fix text area selection.
 It moves selection from left/right to base/extent. left/right
 can cause problems when dragging cursors -- it is sometimes
 difficult to tell which cursor should be dragged, the left or
 right, but we can always keep the base/extent constant.

 Webkit Change: I5609d07ea2ee67fc08d15cfcad31f49302f33297

Change-Id: I2f9b963e93bb1ab86a9b26518fca52449b56d5d9
2012-06-01 14:29:37 -07:00
Ben Murdoch
078b591379 Get a WebViewDatabaseClassic instance lazily. Do not merge.
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
2012-06-01 14:07:20 +01:00
Chris Craik
35ec6b7b30 am 7d4c2ec0: am 53913ed5: Merge "Force webview invalidates on unsuccessful functor attach" into jb-dev
* commit '7d4c2ec0f4dc1843ed5e3f6768d55cc9506052c6':
  Force webview invalidates on unsuccessful functor attach
2012-05-31 18:06:13 -07:00
Chris Craik
41ee465734 Force webview invalidates on unsuccessful functor attach
Functor attach should always be successful, but adding a fallback just in
case. Also invalidates the WebView on initial content arriving.

bug:6511995
Change-Id: Ibca16505afec9f693ea4a7cc4966cd6d7353725c
2012-05-31 15:23:11 -07:00
George Mount
9c8d63f48e am acd796b1: am 20c15a42: Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev
* commit 'acd796b1a6f217e0798d008ba88dc101b5ace34e':
  Fix monkey NPE in AutoCompletePopup
2012-05-30 07:43:48 -07:00
George Mount
20c15a4271 Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev 2012-05-30 07:36:11 -07:00
John Reck
4c11a92b62 am 4a53b519: am 2cd50c9d: Merge "Don\'t long press if preventDefault is called" into jb-dev
* commit '4a53b51955e6d166a81ac09bdb1633b9224839ab':
  Don't long press if preventDefault is called
2012-05-29 16:30:15 -07:00
John Reck
2dc3ffd31a Don't long press if preventDefault is called
Bug: 6554060

Change-Id: Iad263c78a0e1504dd10e9ef5b92505bca6991cbc
2012-05-29 16:02:23 -07:00
George Mount
7a2cb35513 Fix monkey NPE in AutoCompletePopup
Bug 6554866

Change-Id: I2942e55d98bc768f5c5c563240c1841c7e869b3c
2012-05-29 15:39:50 -07:00
Ben Murdoch
1bd37b176e Deprecate WebChromeClient.onJsTimeout
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.

Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
2012-05-28 14:20:07 +01:00
John Reck
83a40e8e64 am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev
* commit '2611f1eced80db74d07563e03bb99a146aa461b6':
  Copy over the scroll position for the scrolling layer
2012-05-25 15:56:48 -07:00
John Reck
7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev 2012-05-25 15:49:15 -07:00
John Reck
ec1b71adc6 Copy over the scroll position for the scrolling layer
Bug: 6557664

Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
2012-05-25 14:02:26 -07:00
Teng-Hui Zhu
0926424028 am 314745cd: am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev
* commit '314745cd5661db8672505ec753a6f88b9e80e609':
  Better support for HTML5 audio loop.
2012-05-25 10:18:09 -07:00
Teng-Hui Zhu
65e08329ee Merge "Better support for HTML5 audio loop." into jb-dev 2012-05-25 10:10:11 -07:00
John Reck
fcf4c34545 am 731327a9: am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
* commit '731327a93a9e5f1550effaf48fb944d8cae507d5':
  Support skipping a touch stream due to lack of handlers
2012-05-24 18:18:07 -07:00
John Reck
f738810247 Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 2012-05-24 18:11:36 -07:00
John Reck
c1e80a360a Support skipping a touch stream due to lack of handlers
Bug: 6317798

Change-Id: Ia1652e9030e877e270326e9e8a8b040810b89f09
2012-05-24 15:31:13 -07:00
Teng-Hui Zhu
6f62ef32e2 Better support for HTML5 audio loop.
Loop is trigger by a seek to 0 when ended on native side but there is no play
call. So on java side, we detect this and call into native side to trigger a
play after completion.
This fixed the UI problem and keep in sync with the native mode.
Beyond that, we don't need to reload for looping and we don't have the seek
to play artifacts.

bug:5461143

webkit change:
https://android-git.corp.google.com/g/#/c/193750/

Change-Id: I779f3e1fbc789832a1a99d1f17823db6b57b35df
2012-05-24 15:24:29 -07:00
George Mount
a893591ff6 am 4f313676: am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
* commit '4f3136768038398e109a66d393d74858d2754a34':
  Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 11:13:25 -07:00
Ben Murdoch
b9fcb1334d resolved conflicts for merge of cde7efde to master
Change-Id: I44433670a897c23b3bd388cbba9cfacf80e3345f
2012-05-24 18:02:56 +01:00
George Mount
222f561350 Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev 2012-05-24 09:53:17 -07:00
George Mount
7e9f62ef48 Use setCustomSelectActionModeCallback to disallow action bar.
Bug 5993716
 Use setCustomSelectActionModeCallback rather than
 setLongClickListener to disallow custom action block so
 that long press can bring up the paste window.

Change-Id: I916e77dcea7914c02191f0ecda37cd126318807d
2012-05-24 07:43:27 -07:00
Ben Murdoch
2b5d66824b Make the WebCore thread watchdog opt in.
Add a setting on WebViewCore to control whether we monitor
the responsiveness of the WebCore thread. Default is not
to monitor.

Bug: 6447214
Change-Id: Ia95e5c769d458dcd24ae50660b2f22e93851956f
2012-05-24 13:01:57 +01:00
George Mount
cf73e52825 am 5354a327: am 8871403a: Merge "Show caret handle when clicking in the middle of text." into jb-dev
* commit '5354a3277736b57daa0003409ce37c5b5f3b2236':
  Show caret handle when clicking in the middle of text.
2012-05-23 15:00:47 -07:00
George Mount
c2813fa759 Show caret handle when clicking in the middle of text.
Bug 6545325

Change-Id: Ibea6daca1da12eec38b05f7f451561d31bb3c983
2012-05-23 14:04:54 -07:00
Chris Craik
7d35738a2d am 9970bbac: am 3534e134: Merge "Avoid crash if onDetachedFromWindow called after destroy" into jb-dev
* commit '9970bbac1f4951f5910aa5148e189a0a284f9e46':
  Avoid crash if onDetachedFromWindow called after destroy
2012-05-22 17:26:44 -07:00