Commit Graph

2119 Commits

Author SHA1 Message Date
John Reck
7b0fdc100e am 786513ab: am 0507ac4d: Use isHighEndGfx to determine texture pool
* commit '786513aba608d958e69deee3fbdf003bdf5d9632':
  Use isHighEndGfx to determine texture pool
2011-11-21 21:07:33 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
2011-11-21 13:30:32 -08:00
Kristian Monsen
38bc731875 am 376e93fc: am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
* commit '376e93fcea19cd491af59631f3934ab036e1e846':
  Improving PictureListener deprecating comments
2011-11-20 07:31:41 -08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Bart Sears
3f6114164f am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
  Content and viewport rects set in one step.
2011-11-18 15:22:57 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Kristian Monsen
4aad1022eb Improving PictureListener deprecating comments
Change-Id: If189823962c49db9681845996e97eec31fedcca6
2011-11-18 17:09:12 +00:00
Michael Kolb
778f146cf4 am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '5397bb52fba04e8dc8496d731611210213847308':
  Draw input field focus ring in WebTextView
2011-11-17 15:12:49 -08:00
John Reck
a93a7d6d15 am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
  Fix add single character check
2011-11-17 13:20:15 -08:00
John Reck
6810017f6a am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
  Undeprecate LayoutAlgorithm
2011-11-17 13:20:12 -08:00
Michael Kolb
852585c034 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
Ben Murdoch
131ed03f30 am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 11:46:30 -08:00
Nicolas Roard
0ecd89bce3 am e788fa84: am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
* commit 'e788fa84f1fac845e50922fc536694ce1cc2fbdb':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
2011-11-17 11:46:09 -08:00
Michael Kolb
edb39ce5b4 Draw input field focus ring in WebTextView
Bug: 5628053

Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
2011-11-17 11:08:59 -08:00
John Reck
775e986ece Merge "Fix add single character check" into ics-mr1 2011-11-17 08:48:04 -08:00
John Reck
1da3d65635 Merge "Undeprecate LayoutAlgorithm" into ics-mr1 2011-11-17 08:47:29 -08:00
George Mount
82ed95f410 Content and viewport rects set in one step.
Bug 5342918
 The content rect of the WebView was being retrieved during
 the draw while the viewport rect was being set when the
 draw functor was setup. During animations, the content
 rect was changing between the time the draw functor was
 retrieved and it was executed. The content rect is now
 being set with the viewport rect.

 Wekbkit Change: I05d68dcc

Change-Id: I1b0978eeb27d9f1deddfeba3ede869f735f74394
2011-11-17 08:31:55 -08:00
Mangesh Ghiware
163994c1d4 am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
  Revert change to setInitialScale() to take display density into account.
2011-11-17 07:48:24 -08:00
Ben Murdoch
fead0e14b4 Merge changes I59323dc5,I31a01aa3 into ics-mr1
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 02:13:19 -08:00
Nicolas Roard
e88ca718ed Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 2011-11-16 19:40:04 -08:00
Nicolas Roard
2bc0b01ffe Hack to workaround the fact that the EGL context can be
removed from under us by framework in low memory condition.

bug:5627977
Change-Id: I3c138985e3e6c16f7c15497a1a11ffed93cd8e78
2011-11-16 19:31:00 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
John Reck
f9a6c91f75 Fix add single character check
Bug: 5618801

Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
2011-11-16 16:58:56 -08:00
Mangesh Ghiware
e832b63c97 Revert change to setInitialScale() to take display density into account.
Updated WebView documentation to clarify this behavior.

Additionally, if target-densityDpi is specified in the meta viewport
tag, update the display density in ZoomManager.

Bug: 5477652
Bug: 5327492
Change-Id: I176e87489f76a2ee6595d76a006e302b07595de1
2011-11-16 13:31:56 -08:00
Kristian Monsen
9a77be5dac Fix fix for bug 2816327
Remove native methods define for ANDROID_INSTRUMENT calls.

Need to that after the native registering is done in CL:
https://android-git.corp.google.com/g/#/c/148917/

Change-Id: Ic91aec54cb052c29aa06aee028cf8023cd69ed15
2011-11-16 19:59:27 +00:00
Ben Murdoch
cd0dd93d13 WebViewDatabase v11 for ICS.
Bump WebView database version to 11. This has the following effects:

- Removes the old webview cookie table on GB devices. Cookies are now
  managed by the Chromium stack.
- Removes the old webview cache database on GB devices. Cache is now
  managed by the Chromium stack.
- Autocomplete form data is now stored/retrieved based on
  the URL minus the query string/fragment. Upgrade any existing
  form URLs in the database to match this format, so we can
  still use them. This will impact GB and HC devices.

  This has an unfortunate side effect that we may end up with
  duplicate URLs in the formurl table (say we had two URLS for the
  same host but with different query strings). Currently we only take
  the first url from the table - which is fine when they were
  unique. The simplest way to work around this is just iterate all the
  rows returned and use all the values we find.

Bug: 5560410
Change-Id: I59323dc5e523969e0a1c268b5936d6fa998d625c
2011-11-16 19:33:21 +00:00
John Reck
5a1ef4132f Undeprecate LayoutAlgorithm
Bug: 5533078
 There is no alternative and this is still useful and used. It should
 not have been deprecated.

Change-Id: I641026cf76ea87738909827b7c48a556d9021d11
2011-11-16 11:08:44 -08:00
Ben Murdoch
f10daf6470 Fix a bug in the database upgrade process, and refactor slightly.
During upgrade from v9 -> v10 the database version was not
being updated.

Also remove conditionals based on what are effectively hardcoded
truth values to simplfiy the logic greatly.

Bug: 5560410
Change-Id: I31a01aa35a109a951d4e4c6d5b884bb666668b28
2011-11-16 18:47:59 +00:00
John Reck
a952f8abfd am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
  Call onScrollChanged when scrolling layers
2011-11-15 13:07:11 -08:00
John Reck
83b9e1d99d Call onScrollChanged when scrolling layers
Bug: 5533389
 Treat layer scrolling as a no-op scroll by calling
 onScrollChanged with old scroll == new scroll

Change-Id: I1dc2b94b37c65bf088806b8d28be32883e3b8bee
2011-11-14 16:17:54 -08:00
Kristian Monsen
e1d2f3cf85 Fix build
Change-Id: I8198f7a8470e7c9500ab2f6512162bbb55ea6ee7
2011-11-14 15:28:14 +00:00
Kristian Monsen
10a09dc163 Merge "Removing the ability to get native instrumentation as part of nav dump" 2011-11-14 04:28:32 -08:00
Kristian Monsen
a3c157eef0 Removing the ability to get native instrumentation as part of nav dump
This is to be able to remove ANDROID_INSTRUMENTATION code.

Note that it would only print useful information if webcore
was compiled with ANDROID_INSTRUMENTATION on.

There is an open bug for problems with ANDROID_INSTRUMENTATION:
http://b/issue?id=2816327

Needs Browser CL:
https://android-git.corp.google.com/g/#/c/149442

Change-Id: Ie8c3c3a08a8bb15936831e25faac3155906bae70
2011-11-11 16:11:36 +00:00
Akwasi Boateng
1333742bed am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:34:19 +00:00
John Reck
9f9fac0ad2 Fix lastVisible/global rects
Bug: 5601629
 References tend to always be equal to the things they are referencing,
 use copies instead.

Change-Id: I0827878e91ef1fa6e0abe2d6499d55f4a211d890
2011-11-10 17:33:24 -08:00
John Reck
2c7db013bc am 0f077739: am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1
* commit '0f0777399defe6bca965d9c33e9dfe256eb56fee':
  Pause drawing when not visible
2011-11-10 19:39:46 +00:00
John Reck
843e04d977 Merge "Pause drawing when not visible" into ics-mr1 2011-11-10 09:19:55 -08:00
George Mount
c60baec7a7 Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 2011-11-10 08:32:18 -08:00
John Reck
e9a291e781 am 0e17f653: am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1
* commit '0e17f65312e57c7f1489010284987c505142b778':
  Fix determining find on page overlap
2011-11-10 05:42:49 +00:00
John Reck
5f1c549132 Pause drawing when not visible
Bug: 5594608
 If onPause is called or if the view or view's window is no longer
 visible, pause webview drawing. Calls to onDraw will continue to work,
 but animations and other continual drawing will stop

Change-Id: I11640f087852d1a9a33b945ff72297fab1d25b94
2011-11-09 17:19:43 -08:00
George Mount
331493085d DO NOT MERGE Set the initial scroll position for RTL.
Bug 5268793
 Webkit knows about the correct initial position for web pages.
 On initial show, scroll to the webkit position.

 Cherry-picked from master CL: I2537b84a

 External WebKit CL: I6a91b97f

Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
2011-11-09 15:37:26 -08:00
George Mount
a2c9f2707b Merge "Set the initial scroll position for RTL." 2011-11-09 15:15:42 -08:00
George Mount
e263bc1a36 Set the initial scroll position for RTL.
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
2011-11-09 14:43:55 -08:00
Michael Kolb
35d17ec7c1 am 3a77503c: am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1
* commit '3a77503ca16253a702977a11406aec7a332837cb':
  Remove flicker from WebTextView
2011-11-09 21:51:19 +00:00
Steve Block
d951473859 Merge "Clean up JavaDoc for WebView.addJavascriptInterface()" 2011-11-09 09:43:53 -08:00
John Reck
36a7f2a9ad Merge "Fix determining find on page overlap" into ics-mr1 2011-11-09 09:28:11 -08:00
Steve Block
4cd73c5bfd Clean up JavaDoc for WebView.addJavascriptInterface()
Bug: 5461416
Change-Id: Ic83e0e4035f6230134e4f36938e53f106c468876
2011-11-09 17:04:49 +00:00
Kristian Monsen
b69ce80383 Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 2011-11-09 03:35:01 -08:00
Kristian Monsen
008c37d8f4 Part of fix for bug 5584571 Add HTTP request header with app name
Need the context to get the package name, adding it method here
that can be called from JNI.

Change-Id: I530d81d9d922ea73a3f9d185618a5c4cfde0aca7
2011-11-09 11:23:35 +00:00
John Reck
d6ac727234 Fix determining find on page overlap
Bug: 5572138

Change-Id: Ie528e1cf9df363307018e01a898e8d9dfff1cd45
2011-11-08 15:00:17 -08:00