Commit Graph

608 Commits

Author SHA1 Message Date
Andrei Popescu
3565456ca7 Merge "Make sure application cache manifest files are not cached." 2010-02-02 10:21:51 -08:00
Andrei Popescu
a1ba11bd78 Make sure application cache manifest files are not cached.
Fix b:2326937
2010-02-02 18:10:35 +00:00
Patrick Scott
8af3cfc2a4 Check for null data after decoding a data: url.
Refactor StreamLoader and friends since they all use a Context.  Change the
successful status to 200 instead of 0. Not sure why it was ever 0.

Bug: 2364322
2010-02-02 11:20:54 -05:00
Andrei Popescu
5e7bb0a9ca Implement support for v8 counters 2010-02-02 11:40:20 +00:00
Shimeng (Simon) Wang
8a7ac8db1a Anchor the page at top left corner when webView size changed.
Bug: 2356891
	modified:   core/java/android/webkit/WebView.java
2010-02-01 15:06:38 -08:00
Grace Kloba
a7bc87cb6a Added pause/resume update Picture to WebViewCore.
When animating zoom, we pause updating picture for
smooth animation.

Fix http://b/issue?id=2359016

Remove the unused param in reducePriority/resumePriority
2010-02-01 09:45:59 -08:00
Jean-Baptiste Queru
d09f4aaba2 resolved conflicts for merge of bb074ef9 to master
Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
2010-01-28 15:21:25 -08:00
Andreas Huber
2fd75f3515 Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played." 2010-01-28 12:56:17 -08:00
Andreas Huber
2564300936 API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.
related-to-bug: 2393577

Original change by Andrei Popescu <andreip@google.com>
2010-01-28 11:52:43 -08:00
Grace Kloba
98e6fcf2f7 Need to check parent for performLongClick() as it
is the result of a delayed message.

Fix http://b/issue?id=2398251
2010-01-27 15:20:30 -08:00
Grace Kloba
d0d9bc2f2f Add request header support for the Browser/WebView.
QSB can use this instead of POST to send the location
data. After QSB makes the switch, we should also
remove the POST_DATA intent which is hidden.

Add loadUrl(String url, HashMap extraHeaders) to
WebView so that the caller can send the extra http
headers.

Remove "inline:" as no one is using it and it is a
hidden feature.

Part 1 of 3-project checkin.
2010-01-27 12:28:11 -08:00
Grace Kloba
769ed21c33 Fix http://b/issue?id=2400423.
When the same page is loaded, updateRestoreState
will be false when we finish the first layout. As
we are still in the same page, we don't want to
update the current zoom/scroll. But in some cases,
like a site switch from mobile to full site and
keeps the same url, we do want to update the zoom
range as the viewport spec changed. Otherwise, user
can't zoom in the full site as the WebView thought
it is still a mobile non-scalable page.
2010-01-27 12:24:38 -08:00
Nicolas Roard
493bcdda3b Fix memory leak with layers.
This fix bug http://b/2394813
This is a two-parts CL (needs C++ modifs)
2010-01-26 18:36:51 +00:00
Grace Kloba
7168231a40 am c811cd91: am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db'

* commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db':
  Delay resetting mPreventDrag flags so that the Plugin
2010-01-26 10:27:06 -08:00
Grace Kloba
79015fd263 am cf0957ce: am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542'

* commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542':
  As embedded and full screen shares the same view,
2010-01-26 10:26:57 -08:00
Patrick Scott
74f6c03bb2 Set a flag that indicates a response is pending.
This will keep track of multiple calls to proceed/cancel. If an error has
occurred and the client calls proceed or cancel more than once, the loader may
be null. Set the flag during the callback and reset after a response.

Bug: 2371305
2010-01-26 08:17:18 -05:00
Grace Kloba
caf0ce3ca2 Delay resetting mPreventDrag flags so that the Plugin
will have more time to respond whether it wants to
handle the touch events. (not have to return the
value from WebViewCore before the first tap is up)

Fix a potential null pointer exception.
2010-01-25 18:36:48 -08:00
Grace Kloba
96949efc54 We were blocking updating display tree during drag.
Now we only lower the WebViewCore thread priority.
So rename the functions to reflect the new meaning.
2010-01-25 09:53:01 -08:00
Mike Reed
f904be1659 Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Mike Reed
729d8369b5 disable high-quality filtering during scrolling, until I can cached the scaled images. 2010-01-25 08:30:35 -05:00
Grace Kloba
3a0def280f Manual merge pinch zoom from Eclair to Master.
Too many conflicts which prevent me to use git cherry-pick.
Merge based on the source diff.

WebSettings.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commitdiff;h=5f01d7e268167c5cfb3366ce08e20a66d9b6fa6f

WebView.java (excl. drag tracker changes)
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebView.java;h=ab1841e140d72c22885512722cf1b75925bb8747;hp=ed1a98ae2d9321a483f6f8fa97b29b78121e94a7;hb=eclair;hpb=db08d5cd441424e4f9621aae7c2414934f781400

WebViewCore.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebViewCore.java;h=8ac915c556e3461f3c572c3a68d191ca1fecfee7;hp=a5a48527a389609e40da14ecad8c12dd8377cfaf;hb=eclair;hpb=dafc19a1406bdd554fb4629d79c8aa4d75aca363
2010-01-23 21:11:54 -08:00
Grace Kloba
5ff24d5da4 DO NOT MERGE
This reverts commit 52cb3cbd6f.
2010-01-22 12:45:54 -08:00
Grace Kloba
77dc179baa As embedded and full screen shares the same view,
we have to replace the AbsoluteLayout with
ViewGroup.Layout before setting it to the dialog
as dialog's FrameLayout doesn't accept AbsoluteLayout.

This should fix the crash when changing orientation.
2010-01-21 19:13:34 -08:00
Derek Sollenberger
72666bac20 am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'

* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:39:15 -08:00
Derek Sollenberger
7cabb03da7 Resize the WebView when the soft-keyboard appears in landscape mode.
The WebView notifies the IME that it wishes to be resized when the
soft-keyboard is displayed. This fixes http://b/2170192.
2010-01-21 10:37:38 -05:00
Grace Kloba
52cb3cbd6f DO NOT MERGE
Just scale the canvas instead of changing the real
scale factor during pinch.

Added over limit zoom feedback for pinch in the WebView.

Fix http://b/issue?id=2383539
2010-01-20 21:58:27 -08:00
Grace Kloba
8681df902e DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.

Fix http://b/issue?id=2385061
2010-01-20 19:15:44 -08:00
Mike Reed
12bcbdc681 Do not merge
port stretchy from master
2010-01-20 16:27:36 -05:00
Grace Kloba
f167c4bfca DO NOT MERGE
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
2010-01-18 15:30:59 -08:00
Grace Kloba
17b14bd36a DO NOT MERGE
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.

This should fix the weird state Bart got in with
m.wikipedia.org.
2010-01-18 15:29:46 -08:00
Grace Kloba
5a0bf1f03e DO NOT MERGE
Remove testing (enable plugin) code.

No reflow when zoom in, auto reflow when zoom out.

Fix http://b/issue?id=2375955
2010-01-18 15:29:46 -08:00
Grace Kloba
19c9df3c1d DO NOT MERGE
Bring back +/- when panning. Dismiss it when pinching.
2010-01-15 16:35:40 -08:00
Andrei Popescu
f5dba888c6 Detect if the current network is wifi or not and update webkit.
This info is passed to youtube.com via navigator.networkType

Fixes Bug: 2368650
2010-01-15 20:04:08 +00:00
Grace Kloba
4d69ac6695 Merge "DO NOT MERGE" into eclair 2010-01-14 19:29:09 -08:00
Grace Kloba
fd787ba79d DO NOT MERGE
When adjust scale for zoom overview, keep the state
of whether textWrapScale is matching mActualScale.
So if user pinch during loading, we won't reflow.

Fix http://b/issue?id=2370552
2010-01-14 18:30:45 -08:00
Grace Kloba
76336f2ccf DO NOT MERGE
If mViewportWidth is 0, it means screen width. If
textwrapWidth is not same as view width, which means
that we are in the state triggered by pinch, always
send textwrapWidth as width to WebKit to keep the
same layout.

Fix http://b/issue?id=2375232
2010-01-14 18:18:41 -08:00
Nicolas Roard
1061a4dd73 am 0123101a: am af2af4e5: Add proper support for fixed position elements
Merge commit '0123101af0e15221026f97f19dad23488840700a'

* commit '0123101af0e15221026f97f19dad23488840700a':
  Add proper support for fixed position elements
2010-01-14 13:18:25 -08:00
Nicolas Roard
af2af4e53a Add proper support for fixed position elements
this is two-part change, see  http://android-git.corp.google.com/g/#change,37091 for the C++ counterpart.
This CL implements fixed position elements (css position: fixed) using layers, supporting pixels and percent lengths.

It addresses http://b/1914365
2010-01-14 14:46:07 +00:00
Grace Kloba
5f01d7e268 DO NOT MERGE
Use the common ScaleGestureDetector to detect the
multi-touch motion.

Check both supportZoom and getBuiltInZoomControls
to decide whether enable the multi-touch behavior.
This should the new pinch behavior only replace the
old +/-.

Fix http://b/issue?id=2363260

Only update textWrapScale if it is different. This
should fix the performance decrease caused by initial
multi-touch code.

Fix http://b/issue?id=2371694
2010-01-13 22:02:53 -08:00
Patrick Scott
139f6f31d1 am 70c4f6cf: am 021b7b44: Add a static method to obtain the mime type from extension.
Merge commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec'

* commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec':
  Add a static method to obtain the mime type from extension.
2010-01-13 11:51:33 -08:00
Patrick Scott
021b7b443f Add a static method to obtain the mime type from extension.
This method is used by WebKit to obtain the mime type from an extension.

Bug: 2368893
2010-01-13 14:12:43 -05:00
Leon Scroggins
a77f93f76a am ace8addc: am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
Merge commit 'ace8addce47efc03be5038eef48d7fb066b14aae'

* commit 'ace8addce47efc03be5038eef48d7fb066b14aae':
  Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:15:38 -08:00
Leon Scroggins
2edd68260f Create a new ImeOption that disables fullscreen in landscape, and use it.
EditorInfo:
Add a flag to tell the InputMethodService to never go into fullscreen
mode.

InputMethodService:
When the new flag is set, onEvaluateFullscreenMode always returns
false.

WebTextView:
Use the new flag, along with IME_FLAG_NO_EXTRACT_UI.  Fixes
http://b/issue?id=2358360
2010-01-12 17:29:25 -05:00
Grace Kloba
e67d5cee67 DO NOT MERGE.
Couple of tweak for multi-touch in WebView.

1. If we can't zoom, don't get in multitouch mode.
   This avoid the logo in google.com looks fuzzy.
2. Reset mAnchor after sending VIEW_SIZE_CHANGED.
3. Don't call zoom when finishing multitouch unless
   zoom is called before.
4. Change the width for nativeSetSize, which was modified
   in the last check-in. The new logic should make both
   msn.com and news.google.com looks correct.
5. Use the pressure instead of distance/time to filter
   out the jitter just before lifting the finger.

Fix http://b/issue?id=2360032
2010-01-12 09:58:43 -08:00
Andrei Popescu
93aea69649 Merge "Implement timeupdate events for video tag." 2010-01-12 08:17:27 -08:00
Andrei Popescu
048eb3bfa1 Implement timeupdate events for video tag.
Fix http://b/issue?id=2210105
2010-01-12 16:13:52 +00:00
Cary Clark
bad0c54de9 rebuild the nav cache if the clicked on node is invalid
Rebuild the nav cache in the webkit thread after determining
that the clicked on node isn't valid. Remove old code that
passed a flag to avoid using the invalid node, since it
should always be valid now.

requires a companion fix in external/webkit

fixes http://b/2362334
2010-01-12 09:18:08 -05:00
Grace Kloba
4c7ec8d6ab As setNewZoomScale is called asynchronously, the
WebView can be destroyed. If it is, skip scaling.

Fix http://b/issue?id=2366538
2010-01-11 15:36:37 -08:00
Derek Sollenberger
c408d5c278 am 1fed31aa: am fef4874a: fixing build break by removing unused imports.
Merge commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8'

* commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8':
  fixing build break by removing unused imports.
2010-01-11 14:14:28 -08:00
Derek Sollenberger
fef4874afd fixing build break by removing unused imports. 2010-01-11 16:26:07 -05:00