Commit Graph

1898 Commits

Author SHA1 Message Date
Kristian Monsen
abecca9c60 Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-29 12:35:45 -07:00
Derek Sollenberger
ecfeebebff Merge "Add a runtime switch between Raster and Ganesh rendering modes." 2011-07-29 12:34:32 -07:00
Kristian Monsen
0d6c6a73c6 Part of fix for bug 4997380: Some error types unknown to SslError
Use the new SslError chromium error codes parser.

Change-Id: I0b5584bd3f3e042600caebe72f4e41989318cd6a
2011-07-29 20:10:21 +01:00
Chris Craik
5cf78f7bd8 use pageswap callback to sync WebTextView with drawing of page
bug:5008210

Redraw the WebTextView when the page swaps (and thus the background is updated)
That way it updates at (approximately) the same time as the page. In software
rendering, do as before.

Depends on following external/webkit change:
https://android-git.corp.google.com/g/#change,124606

Change-Id: I59d7266a49d0ba734efdb88fef5fafe68aecfbce
2011-07-28 15:42:58 -07:00
Chris Craik
24f2936d35 Merge "Use WebTextView overlay to render text fields/areas much faster" 2011-07-27 15:46:44 -07:00
Chris Craik
e3e7a88b4d Use WebTextView overlay to render text fields/areas much faster
bug:5008210

Still has the following issues:

* colors are always black & white

* ignores centering, word wrap from text area

* gray background text (such as with instant search) and other textfield effects
  aren't shown

The DebugFlags.DRAW_WEBTEXTVIEW can still be used to overlay red text over the
input box.

Change-Id: I7f22321c31b9edbc5351cac13f2e17b0ee19d563
2011-07-27 11:19:14 -07:00
Ben Murdoch
63d050034d Merge "Add a System.Secure setting for the Autofill server URL." 2011-07-25 09:41:46 -07:00
Ben Murdoch
50799a9948 Fix for Autofill calling WebView.getSettings on background thread.
Autofill was reading the WebView's WebSettings on a background thread.
Move it to the UI thread to conform to the WebView API and get rid of a
Strict Mode violation.

Bug: 5072283
Change-Id: Ib0ac60697f1e629ac1ef1743545b5cf0ac2cf52a
2011-07-25 11:35:45 +01:00
John Reck
8afdd412ac Merge "Fixup handling destroy" 2011-07-21 16:21:13 -07:00
Chris Craik
b4cd566767 Merge "New log format, Manual log generation, plus logging of invalidates" 2011-07-21 15:59:17 -07:00
Chris Craik
21555abad7 New log format, Manual log generation, plus logging of invalidates
bug:5062896

Added features to TileProfiler, updated jni interface to allow querying of
arbitrary log data via strings. Depends on the following webkit change:

https://android-git.corp.google.com/g/#change,122779

For new logging jni interface, and logging of invalidates.

Change-Id: I80ba6702b87e86ec76e5b0eafde45f4ef3a80ad3
2011-07-21 14:22:55 -07:00
John Reck
00d5bf7e44 Fixup handling destroy
Bug: 5002925
 White list certain messages that can be handled after WebViewCore
 was destroyed (specificially pause/resumeTimers, which are per process)
 and reject all other messages. This avoids using the undocumented
 removeCallbacksAndMessages(null) trick, as well as makes sure PAUSE_TIMERS
 and RESUME_TIMERS are processed in the correct order the correct number
 of times.

Change-Id: I8c51172e015f923ffeb0816a8ee2ab63219d0f96
2011-07-21 12:42:40 -07:00
Huahui Wu
598b6fe86b Merge "b/4070489 Jumpy motion when switching fingers during zoom gesture." 2011-07-21 11:08:55 -07:00
Ben Murdoch
9999c1d977 Add a System.Secure setting for the Autofill server URL.
The Autofill server is now configured as a system setting. Add
that setting and a method to be called over JNI from the chrome
stack to retrieve it.

See also external/chromium change I3a22ae42402f52207eee2d0d9df64700cb7c9f45

Bug: 4515820
Change-Id: I0aa85c5bef834b1120baaabdc2dd2e4e607a63b6
2011-07-21 18:13:22 +01:00
Huahui Wu
5f4835af72 b/4070489 Jumpy motion when switching fingers during zoom gesture.
Change-Id: Ia7845cef5e58b4922e4475e48085b7b95e15bea2
2011-07-21 09:27:40 -07:00
Shimeng (Simon) Wang
50c5d2be63 Merge "Change log msg since viewport can be changed before first layout." 2011-07-19 11:15:49 -07:00
Shimeng (Simon) Wang
a6c5d383a8 Change log msg since viewport can be changed before first layout.
Change-Id: I137a897844953bf6b8510b6ee5d6eb89b4b78a6a
2011-07-19 11:07:47 -07:00
Dianne Hackborn
6dd005b481 I. Can. Not. Stand. ViewAncestor.
It was done so we would have the name "ViewRoot" available for a
public API.  However, the name "ViewAncestor" just makes no sense.
So instead, change it to ViewRootImpl.

Change-Id: If9599ca67896f339f6fefa7d1dde121201171d97
2011-07-18 16:16:23 -07:00
John Reck
9a3d51f596 Merge "Add a hidden generic property interface" 2011-07-15 13:18:50 -07:00
John Reck
637758940f Add a hidden generic property interface
Change-Id: Iff890d7802af00a80b0148c7cc3233c6fc4d5dad
2011-07-15 11:14:43 -07:00
Mathew Inwood
e7821cd607 SearchBox API changes, to know when calls succeeded.
Depends on change: I5af94c8df8f24dfafb02c4052381aa547c72684c
(due to SearchBox API change).

Change-Id: If283ecdfa62aecb1fa697b1a2cd43b771b908d72
2011-07-14 11:40:03 +01:00
Chris Craik
445ab74a21 Tile profiling interface
Allows access to underlying WebView benchmarking calls.

Uses C++ backend from the following CL:
https://android-git.corp.google.com/g/#change,121035

Change-Id: Ib205340451aadfd40425f492afa4f2e46d314ebc
2011-07-13 13:19:37 -07:00
Derek Sollenberger
1d335f30f2 Add a runtime switch between Raster and Ganesh rendering modes.
There are corresponding changes in:

external/webkit -- change ID: 120660
packages/apps/Browser -- change ID: 120664

bug: 5013645
Change-Id: I4fc8ca6735a06682671ee06378c738ccf172e576
2011-07-12 13:30:40 -04:00
Ben Murdoch
06da76bd2d Add missing auto-fill strings.
These strings had a defintion native side, but no corresponding
definition java side which would lead to a crash. Strings taken from
chrome/app/generated_resources.grd - see
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?r1=75912&r2=76117&pathrev=88489

Also note that credit_card_number_preview_format is no longer needed.

See also change Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2

Change-Id: I829b5d24e6f9a04211ee91c3f670c8659c004cd9
2011-07-12 14:54:40 +01:00
Shimeng (Simon) Wang
07ac175452 Set mActualScale when initialScale is set.
This sets mActualScale to be correct value if initialScale is set.

issue: 4982074
Change-Id: I69d12d185710e89fc91a3a6bdf566c7092f059b7
2011-07-11 14:13:17 -07:00
Shimeng (Simon) Wang
e5f5e82027 Merge "Prevent set mInitialScale being overridden by mDefaultScale." 2011-07-08 16:48:23 -07:00
Shimeng (Simon) Wang
1151fe78fc Prevent set mInitialScale being overridden by mDefaultScale.
If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.

issue: 4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
2011-07-08 14:38:38 -07:00
John Reck
effa7523f4 Merge "NPE guard in setupViewport" 2011-07-08 12:43:22 -07:00
Kristian Monsen
7cec24f747 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
John Reck
d4324aa101 NPE guard in setupViewport
Bug: 4163660

Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
2011-07-08 11:23:39 -07:00
Kristian Monsen
918b183295 Merge Chromium at r12.0.742.93: New autofill string
Added a string that we now use.

Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
2011-07-08 16:45:10 +01:00
Shimeng (Simon) Wang
ab5a5e6748 Merge "Update viewport asap." 2011-07-07 16:17:16 -07:00
Shimeng (Simon) Wang
56bd4349fc Update viewport asap.
Update viewport as soon as possible to make sure layout has correct viewport.

This helps fixes gmail flickering issue.

Also helps the case a mobile site is switched to desktop when the
user agent is switched.

issue: 4723800
Change-Id: I3dc9e52d912d49478d562cec3f38d653a563715e
2011-07-07 15:26:22 -07:00
Huahui Wu
1d19c18f9b Merge "Revert "b/3302378 Passes touch pressures, size and timestamps to webkit."" 2011-07-07 15:10:25 -07:00
Huahui Wu
98933f3f68 Revert "b/3302378 Passes touch pressures, size and timestamps to webkit."
This reverts commit 6e64e0c617.
It introduced a null pointer crash for pinch-and-zoom.

Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968
2011-07-07 14:58:37 -07:00
Huahui Wu
b083fa61d9 Merge "b/3302378 Passes touch pressures, size and timestamps to webkit." 2011-07-07 11:05:13 -07:00
Huahui Wu
6e64e0c617 b/3302378 Passes touch pressures, size and timestamps to webkit.
Related CL in WebKit:
  https://android-git.corp.google.com/g/#change,118422

Change-Id: Ibf209131a6d9ca8186c461b0c5b6286e5f669d0d
2011-07-07 10:59:27 -07:00
Mathew Inwood
bdaa1aafd5 SearchBox API to determine if it's supported by the current page.
Change-Id: I0119243ed0e19e237c1f51de887af5c954f96693
2011-07-07 12:56:39 +01:00
Shimeng (Simon) Wang
a0c26920b6 Merge "Treat restored defaultScale as overview." 2011-07-06 14:40:53 -07:00
Shimeng (Simon) Wang
1bf0456b29 Treat restored defaultScale as overview.
Since usually restored defaultScale means previous scale is not saved.

issue: 4975315
Change-Id: Icc34469d0459fb5254567fe9f3cc5032b6349405
2011-07-06 14:30:38 -07:00
Steve Block
324a1f6a12 Merge "Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme" 2011-07-05 07:43:56 -07:00
Steve Block
b4db3964f1 Merge "Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called" 2011-07-05 06:34:57 -07:00
Steve Block
e482d89b82 Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme
Bug: 4726284
Change-Id: If4fd3c1a6517a69e0b007f8a67563330eca04449
2011-07-04 18:25:01 +01:00
Steve Block
3af08a975a Merge "Clarify documentation for WebView.loadData()" 2011-07-04 10:06:31 -07:00
Steve Block
b28b22af13 Clarify documentation for WebView.loadData()
This method can access the network, but is subject to the usual same
origin policy.

Bug: 4985285
Change-Id: Ia3afa6ed1eeea9127d3ba5a2ecfead8149138b8e
2011-07-04 13:01:25 +01:00
Steve Block
2cb978e507 Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called
The Java object should remain usable until the WebView is navigated
away from the current page. The native side holds only a weak
reference, so we need to keep a reference Java-side.

Bug: 4990734
Change-Id: I40bd078f779228480cfe6f52d9feb4e60c963b4b
2011-07-04 12:19:17 +01:00
Steve Block
fc8a3b222a Merge "Fix WebViewFragment to avoid detroying the WebView too early" 2011-07-04 02:11:38 -07:00
Teng-Hui Zhu
f17bd97103 Merge "Release the media player when exiting the full screen" 2011-07-01 10:02:27 -07:00
Kristian Monsen
5faaadffbf Merge changes I7e8401a4,I412ddf36
* changes:
  Merge Chromium at r11.0.696.0: New autofill strings
  Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
2011-07-01 08:04:11 -07:00
Steve Block
071970d9d6 Fix WebViewFragment to avoid detroying the WebView too early
We must not call WebView.destroy() until after the WebView has been
removed from the view hierarchy.

Bug: 4974517
Change-Id: I33b3a9d4ec098e2ab50626cb8906da7697ff2a33
2011-07-01 14:10:40 +01:00