OSDN Git Service
Steve Block [Wed, 20 Jan 2010 16:18:49 +0000 (16:18 +0000)]
Fixes a bug in V8 version of jni_utility_private.cpp
When CONVERT_NULL_TO_EMPTY_STRING is defined, an 'else' is missing an opening brace.
This causes compiler errors.
This bug has been present since the code was first committed.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
7fa30a60f66c19c8e6fb91ef799bca4d8d6f57f2#patch9
Change-Id: I7e95217d166733e6cab1f2e74725e368df4c6f4b
Steve Block [Wed, 20 Jan 2010 13:54:01 +0000 (13:54 +0000)]
Move V8 jni_class to bridge/jni/v8/JavaClassV8 and fix style
This is the V8 equivalent of http://trac.webkit.org/changeset/53443
It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33898
Change-Id: I27dcf73cc7d8c0303243ea632361f2210819cbc4
Steve Block [Wed, 20 Jan 2010 13:09:37 +0000 (13:09 +0000)]
Cherry-pick WebKit change 53533 to fix style in WebCore/bridge/JNIUtility
See http://trac.webkit.org/changeset/53533
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I07f44aef5e30c862aa7d6a84dcf9bc4d36059a6c
Steve Block [Wed, 20 Jan 2010 13:07:33 +0000 (13:07 +0000)]
Cherry-pick WebKit change 53497 to rename jni_utility and jni_utility_private to JNIUtility and JNIUtilityPrivate
See http://trac.webkit.org/changeset/53497
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
This change required updating headers in Android-specific files in WebCore and WebKit.
Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
Steve Block [Wed, 20 Jan 2010 12:51:19 +0000 (04:51 -0800)]
am
d9b562d6: am
032a9065: Merge "Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge" into eclair-mr2
Merge commit '
d9b562d65e56e563079a5a7778a41c98aa6cf1b5'
* commit '
d9b562d65e56e563079a5a7778a41c98aa6cf1b5':
Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
Steve Block [Wed, 20 Jan 2010 12:51:13 +0000 (04:51 -0800)]
am
0cfc2e19: am
315ee382: Merge "Cherry-pick WebKit change 53489 to fix style in JavaClassJSC." into eclair-mr2
Merge commit '
0cfc2e19eeb90d6897b190b056e192bc1afd5c44'
* commit '
0cfc2e19eeb90d6897b190b056e192bc1afd5c44':
Cherry-pick WebKit change 53489 to fix style in JavaClassJSC.
Steve Block [Wed, 20 Jan 2010 12:45:38 +0000 (04:45 -0800)]
am
032a9065: Merge "Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge" into eclair-mr2
Merge commit '
032a9065415ac4791c8d73bceba10cfa9fc77bf7' into eclair-mr2-plus-aosp
* commit '
032a9065415ac4791c8d73bceba10cfa9fc77bf7':
Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
Steve Block [Wed, 20 Jan 2010 12:45:35 +0000 (04:45 -0800)]
am
315ee382: Merge "Cherry-pick WebKit change 53489 to fix style in JavaClassJSC." into eclair-mr2
Merge commit '
315ee382f1ca39ab4f263f7e0c25172942fc054c' into eclair-mr2-plus-aosp
* commit '
315ee382f1ca39ab4f263f7e0c25172942fc054c':
Cherry-pick WebKit change 53489 to fix style in JavaClassJSC.
Steve Block [Wed, 20 Jan 2010 12:42:42 +0000 (04:42 -0800)]
Merge "Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge" into eclair-mr2
Steve Block [Wed, 20 Jan 2010 12:42:13 +0000 (04:42 -0800)]
Merge "Cherry-pick WebKit change 53489 to fix style in JavaClassJSC." into eclair-mr2
Steve Block [Wed, 20 Jan 2010 12:26:39 +0000 (12:26 +0000)]
resolved conflicts for merge of
3f4b1969 to master
Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
Steve Block [Wed, 20 Jan 2010 12:09:40 +0000 (04:09 -0800)]
am
070350dd: Merge changes I61cfea19,Ib2fe7793 into eclair-mr2
Merge commit '
070350ddbf1f62724597633c31eda461926f365d' into eclair-mr2-plus-aosp
* commit '
070350ddbf1f62724597633c31eda461926f365d':
Cherry-pick WebKit change 53449 to move JSC-specific implementation of JavaString to a private implementation class
Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
Steve Block [Wed, 20 Jan 2010 11:42:04 +0000 (11:42 +0000)]
Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
See http://trac.webkit.org/changeset/53541
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: Ifa112a8700149b21a1a1bbdf8366844adb3a9ae6
Steve Block [Wed, 20 Jan 2010 12:02:08 +0000 (04:02 -0800)]
Merge changes I61cfea19,Ib2fe7793 into eclair-mr2
* changes:
Cherry-pick WebKit change 53449 to move JSC-specific implementation of JavaString to a private implementation class
Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
Steve Block [Wed, 20 Jan 2010 10:43:14 +0000 (10:43 +0000)]
Cherry-pick WebKit change 53489 to fix style in JavaClassJSC.
See http://trac.webkit.org/changeset/53489
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I0b422e7f29c760a20da348d97444c164f7cad622
Ben Murdoch [Thu, 7 Jan 2010 16:20:05 +0000 (16:20 +0000)]
Refactor our touch event code to use the version submitted to webkit.org by the Qt team.
Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
Grace Kloba [Tue, 19 Jan 2010 22:06:36 +0000 (14:06 -0800)]
am
2ba2794f: am
4d667d7f: Exit the fullscreen mode when the PluginWidget is destroyed.
Merge commit '
2ba2794f78c094c88827bafc31f42afefe710d1e'
* commit '
2ba2794f78c094c88827bafc31f42afefe710d1e':
Exit the fullscreen mode when the PluginWidget is
Grace Kloba [Tue, 19 Jan 2010 22:01:54 +0000 (14:01 -0800)]
am
4d667d7f: Exit the fullscreen mode when the PluginWidget is destroyed.
Merge commit '
4d667d7fc4db50148a046f6913a0db1f0f4cbba5' into eclair-mr2-plus-aosp
* commit '
4d667d7fc4db50148a046f6913a0db1f0f4cbba5':
Exit the fullscreen mode when the PluginWidget is
Grace Kloba [Tue, 19 Jan 2010 19:46:31 +0000 (11:46 -0800)]
Exit the fullscreen mode when the PluginWidget is
destroyed.
Steve Block [Tue, 19 Jan 2010 16:27:17 +0000 (16:27 +0000)]
Cherry-pick WebKit change 53449 to move JSC-specific implementation of JavaString to a private implementation class
See http://trac.webkit.org/changeset/53449
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I61cfea194d679d506d92ca3951032531d6908965
Steve Block [Tue, 19 Jan 2010 15:52:14 +0000 (07:52 -0800)]
am
f83060e8: am
be164dbc: Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
Merge commit '
f83060e89e8ba30d0321f33164a0c4819f837a03'
* commit '
f83060e89e8ba30d0321f33164a0c4819f837a03':
Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
Steve Block [Tue, 19 Jan 2010 15:43:31 +0000 (15:43 +0000)]
resolved conflicts for merge of
acf4a21d to master
Change-Id: If8bb4335848f51919608d28a30ee610acb120ae7
Steve Block [Tue, 19 Jan 2010 15:17:26 +0000 (07:17 -0800)]
am
be164dbc: Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
Merge commit '
be164dbcfc9adfae8ae7c559ebdff00580f8086d' into eclair-mr2-plus-aosp
* commit '
be164dbcfc9adfae8ae7c559ebdff00580f8086d':
Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
Steve Block [Tue, 19 Jan 2010 15:17:21 +0000 (07:17 -0800)]
am
7fb686e7: Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSC
Merge commit '
7fb686e7b9de38c5d493745bcff821cd1782102b' into eclair-mr2-plus-aosp
* commit '
7fb686e7b9de38c5d493745bcff821cd1782102b':
Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSC
Steve Block [Tue, 19 Jan 2010 02:13:06 +0000 (02:13 +0000)]
Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
See http://trac.webkit.org/changeset/53443
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I0f2b0581e0850694953f79d45242c44d16bbf5fa
Steve Block [Tue, 19 Jan 2010 13:01:06 +0000 (13:01 +0000)]
Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
See http://trac.webkit.org/changeset/53464
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in
PluginView.cpp to add a temporary ANDROID guard.
Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
Steve Block [Tue, 19 Jan 2010 00:56:35 +0000 (00:56 +0000)]
Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSC
See http://trac.webkit.org/changeset/53436
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Note that changes to the following were required as a result of this cherry-pick.
- WebCoreFrameBridge.cpp - updated to use JavaInstance::m_instance
- V8Binding/jni/jni_instance - Updated to rename the V8 version of JavaInstance::_instance to JavaInstance::m_instance
to allow the same code path to be used in WebCoreFrameBridge.
Change-Id: I6884f7424c8a0917095f828bda4ca62452e527b5
Steve Block [Tue, 19 Jan 2010 15:00:28 +0000 (15:00 +0000)]
resolved conflicts for merge of
df644d06 to master
Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
Patrick Scott [Tue, 19 Jan 2010 14:19:15 +0000 (09:19 -0500)]
Change LOGE to LOGV.
Steve Block [Tue, 19 Jan 2010 13:45:55 +0000 (05:45 -0800)]
am
eeada71d: Merge "Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC" into eclair-mr2
Merge commit '
eeada71d41faa13ef971e1e95b2b6d25b3c76abf' into eclair-mr2-plus-aosp
* commit '
eeada71d41faa13ef971e1e95b2b6d25b3c76abf':
Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC
Steve Block [Tue, 19 Jan 2010 13:41:20 +0000 (05:41 -0800)]
Merge "Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC" into eclair-mr2
Grace Kloba [Tue, 19 Jan 2010 08:34:41 +0000 (00:34 -0800)]
am
9611825c: am
6a5a35ed: Merge "Should check the enable plugin settings before accepting the plugin mimetypes." into eclair-mr2
Merge commit '
9611825c90fe01b75193ac4163b022178404e1f3'
* commit '
9611825c90fe01b75193ac4163b022178404e1f3':
Should check the enable plugin settings before accepting
Grace Kloba [Tue, 19 Jan 2010 08:34:36 +0000 (00:34 -0800)]
am
1a318d00: am
336f436c: Don\'t call setNPWindowRect unless the plugin has started. Otherwise the plugin won\'t get the rect later as it thinks it is not changed.
Merge commit '
1a318d002f30c34f2a43bbd33897398ea2966f9c'
* commit '
1a318d002f30c34f2a43bbd33897398ea2966f9c':
Don't call setNPWindowRect unless the plugin has
Grace Kloba [Tue, 19 Jan 2010 08:17:25 +0000 (00:17 -0800)]
am
6a5a35ed: Merge "Should check the enable plugin settings before accepting the plugin mimetypes." into eclair-mr2
Merge commit '
6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a' into eclair-mr2-plus-aosp
* commit '
6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a':
Should check the enable plugin settings before accepting
Grace Kloba [Tue, 19 Jan 2010 08:17:20 +0000 (00:17 -0800)]
am
336f436c: Don\'t call setNPWindowRect unless the plugin has started. Otherwise the plugin won\'t get the rect later as it thinks it is not changed.
Merge commit '
336f436ca1f1b868aeabd408e8dbb5d1e893d701' into eclair-mr2-plus-aosp
* commit '
336f436ca1f1b868aeabd408e8dbb5d1e893d701':
Don't call setNPWindowRect unless the plugin has
Grace Kloba [Tue, 19 Jan 2010 08:02:32 +0000 (00:02 -0800)]
Grace Kloba [Tue, 19 Jan 2010 07:48:45 +0000 (23:48 -0800)]
Merge "Should check the enable plugin settings before accepting the plugin mimetypes." into eclair-mr2
Steve Block [Mon, 18 Jan 2010 18:49:13 +0000 (18:49 +0000)]
Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC
See http://trac.webkit.org/changeset/53412
Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick.
Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9
Grace Kloba [Mon, 18 Jan 2010 22:12:37 +0000 (14:12 -0800)]
Don't call setNPWindowRect unless the plugin has
started. Otherwise the plugin won't get the rect
later as it thinks it is not changed.
Grace Kloba [Mon, 18 Jan 2010 20:12:44 +0000 (12:12 -0800)]
Should check the enable plugin settings before accepting
the plugin mimetypes.
Steve Block [Thu, 14 Jan 2010 15:45:16 +0000 (15:45 +0000)]
Cherry-pick WebKit change 52103 - Add a client based Geolocation provider
This is required to ease the process of upstreaming the Geolocation maximumAge handling code.
Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this.
Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
Andrei Popescu [Thu, 14 Jan 2010 19:19:31 +0000 (19:19 +0000)]
Add navigator.networkType to allow apps to detect the connection type.
The online event is fired when the networkType changes.
Bug:
2368650
Steve Block [Fri, 15 Jan 2010 16:58:33 +0000 (08:58 -0800)]
Merge "Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation calls back with a position fix."
Steve Block [Fri, 15 Jan 2010 16:03:39 +0000 (16:03 +0000)]
Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation calls back with a position fix.
This call was removed in https://android-git.corp.google.com/g/#change,21293
but inadvertantly added back in https://android-git.corp.google.com/g/#change,21677 See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
e0330ac957b8434cd2c9c7b5447aaa0faabe77ec
This call is not present in webkit.org.
Change-Id: I712b5d29871e8bda54340e510c2bd7bc411728ee
Nicolas Roard [Fri, 15 Jan 2010 15:31:14 +0000 (15:31 +0000)]
Fix for setting layers opacity through CSS (bug b/
2376455)
Leon Clarke [Fri, 15 Jan 2010 12:04:35 +0000 (04:04 -0800)]
Merge "Check for the absence of a frame. This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. b/issue?id=
2346028"
Grace Kloba [Fri, 15 Jan 2010 02:25:41 +0000 (18:25 -0800)]
am
8a2903f5: am
b8a54826: Don\'t use static jclass unless we hold a reference.
Merge commit '
8a2903f5d11d14c8cb827d22a0a877a6e3507906'
* commit '
8a2903f5d11d14c8cb827d22a0a877a6e3507906':
Don't use static jclass unless we hold a reference.
Grace Kloba [Fri, 15 Jan 2010 02:17:48 +0000 (18:17 -0800)]
am
b8a54826: Don\'t use static jclass unless we hold a reference.
Merge commit '
b8a548263905542f52acfc60682693972f098d25' into eclair-mr2-plus-aosp
* commit '
b8a548263905542f52acfc60682693972f098d25':
Don't use static jclass unless we hold a reference.
Grace Kloba [Fri, 15 Jan 2010 02:05:46 +0000 (18:05 -0800)]
Don't use static jclass unless we hold a reference.
Fix the crash.
Nicolas Roard [Thu, 14 Jan 2010 21:18:44 +0000 (13:18 -0800)]
am
93f808ab: am
388e461f: Add proper support for fixed position elements
Merge commit '
93f808abccaf6f09c5c0226c01942c3be445031a'
* commit '
93f808abccaf6f09c5c0226c01942c3be445031a':
Add proper support for fixed position elements
Nicolas Roard [Thu, 14 Jan 2010 21:15:17 +0000 (13:15 -0800)]
am
459f6c34: am
29b325cb: Fix \'disappearing layers\' bug (see b/
2371053)
Merge commit '
459f6c347256a4d9fe815793302130fe06bd8f83'
* commit '
459f6c347256a4d9fe815793302130fe06bd8f83':
Fix 'disappearing layers' bug (see http://b/
2371053)
Nicolas Roard [Thu, 14 Jan 2010 21:13:37 +0000 (13:13 -0800)]
am
388e461f: Add proper support for fixed position elements
Merge commit '
388e461f3d6bf782b3cfb4bb21bc6264cef9323c' into eclair-mr2-plus-aosp
* commit '
388e461f3d6bf782b3cfb4bb21bc6264cef9323c':
Add proper support for fixed position elements
Nicolas Roard [Thu, 7 Jan 2010 14:22:22 +0000 (14:22 +0000)]
Add proper support for fixed position elements
this is two-part change, see http://android-git.corp.google.com/g/#change,37092 for the java counterpart.
This CL implements fixed position elements (css position: fixed) using layers, supporting pixels and percent lengths.
It addresses http://b/
1914365
Nicolas Roard [Thu, 14 Jan 2010 21:06:14 +0000 (13:06 -0800)]
am
29b325cb: Fix \'disappearing layers\' bug (see b/
2371053)
Merge commit '
29b325cb949b1a41ac8bdeaa77977fcd342aec31' into eclair-mr2-plus-aosp
* commit '
29b325cb949b1a41ac8bdeaa77977fcd342aec31':
Fix 'disappearing layers' bug (see http://b/
2371053)
Leon Clarke [Thu, 14 Jan 2010 16:39:36 +0000 (16:39 +0000)]
Check for the absence of a frame.
This crashes in the situation where the XHR responseXML method is being
called on a document with meta tags.
http://b/issue?id=
2346028
Nicolas Roard [Thu, 14 Jan 2010 15:43:16 +0000 (15:43 +0000)]
Fix 'disappearing layers' bug (see b/
2371053)
The removed code was needed in the previous implementation, but not so anymore as we
recopy the layers to the UI. It causes the bug, as webkit deallocate the tree asynchronously,
which ends up resetting the root layer to zero after the new page was loaded...
Steve Block [Thu, 14 Jan 2010 13:12:13 +0000 (05:12 -0800)]
am
594a3479: am
44364d80: Merge "Update jni_runtime.cpp with the latest changes to appendClassName." into eclair-mr2
Merge commit '
594a347941318556ae40d521e6f5c23fd9cf66b4'
* commit '
594a347941318556ae40d521e6f5c23fd9cf66b4':
Update jni_runtime.cpp with the latest changes to appendClassName.
Steve Block [Thu, 14 Jan 2010 12:43:00 +0000 (04:43 -0800)]
am
44364d80: Merge "Update jni_runtime.cpp with the latest changes to appendClassName." into eclair-mr2
Merge commit '
44364d809fca0d73d06341b521532e85c4c0168b' into eclair-mr2-plus-aosp
* commit '
44364d809fca0d73d06341b521532e85c4c0168b':
Update jni_runtime.cpp with the latest changes to appendClassName.
Steve Block [Thu, 14 Jan 2010 12:40:20 +0000 (04:40 -0800)]
Merge "Update jni_runtime.cpp with the latest changes to appendClassName." into eclair-mr2
Steve Block [Thu, 14 Jan 2010 12:25:49 +0000 (12:25 +0000)]
resolved conflicts for merge of
a08c8a5f to master
Change-Id: I8efc2ef2e8e51d823b7ec8c26bd90ce934f60900
Steve Block [Thu, 14 Jan 2010 11:49:41 +0000 (03:49 -0800)]
am
a48cb1ea: Merge "Move general includes before bindings includes." into eclair-mr2
Merge commit '
a48cb1eae11a1592dfa6fbe6c33af1cec74a56b5' into eclair-mr2-plus-aosp
* commit '
a48cb1eae11a1592dfa6fbe6c33af1cec74a56b5':
Move general includes before bindings includes.
Steve Block [Thu, 14 Jan 2010 11:38:15 +0000 (03:38 -0800)]
Merge "Move general includes before bindings includes." into eclair-mr2
Steve Block [Thu, 14 Jan 2010 10:52:53 +0000 (10:52 +0000)]
Update jni_runtime.cpp with the latest changes to appendClassName.
WebKit change http://trac.webkit.org/changeset/53193 updated appendClassName to use
JSC::StringBuilder, rather than JSC-specific types. This allows this method to be
used with V8 as well as JSC.
A clean cherry-pick of this change would require changes 52026, 52028, 52075 and
52329 to be cherry-picked also. To avoid this churn, we simply update jni_runtime.cpp
to reflect the version at change 53193.
Change-Id: I6602469aeea59d8146ab1e72f312888b77522406
Steve Block [Wed, 13 Jan 2010 17:13:01 +0000 (17:13 +0000)]
Move general includes before bindings includes.
This avoids problems with collisions between WebCore/platform/text/StringBuilder.h and the new
JavaScriptCore/runtime/StringBuilder.h. The latter is added in WebKit change 52075, so will be
picked up in the next WebKit merge. We may also cherry-pick the changes which add this file
as they are relevant to upstreaming in WebCore/bridge.
In WebCore, we want '#include "StringBuilder.h"' to pick up the WebCore StringBuilder.h. However, when
building WebCore for JSC, we need JavaScriptCore/runtime on the include path so that the JSC headers
are picked up correctly. This change puts JavaScriptCore/runtime and other bindings includes after the
WebCore and other general includes, so that the WebCore StringBuilder.h is picked up.
This was upstreamed to webkit.org in http://trac.webkit.org/changeset/53254
Change-Id: I1b20b6d457f1d5d1f08764ff0b537058e0742835
Grace Kloba [Thu, 14 Jan 2010 03:19:47 +0000 (19:19 -0800)]
Grace Kloba [Thu, 14 Jan 2010 02:07:24 +0000 (18:07 -0800)]
DO NOT MERGE.
If the old screen width is 0, don't bother find the
node to realign the page.
This shaves off 1/2 of the increased time in the
page_cycler due to the new pinch changes.
e.g. with moz suite.
It was 201422 ms
After pinch changes, it is 218531 ms
After this change, it is 207367 ms
Fix http://b/issue?id=
2371694
Patrick Scott [Wed, 13 Jan 2010 19:51:46 +0000 (11:51 -0800)]
am
e4771f1b: am
6916255e: Call into MimeTypeMap to get the mime type for an extension.
Merge commit '
e4771f1b95589eff8479702dfbf5ef03c267c5c3'
* commit '
e4771f1b95589eff8479702dfbf5ef03c267c5c3':
Call into MimeTypeMap to get the mime type for an extension.
Patrick Scott [Wed, 13 Jan 2010 19:37:41 +0000 (11:37 -0800)]
am
6916255e: Call into MimeTypeMap to get the mime type for an extension.
Merge commit '
6916255e3bc5760bcaac2ec7d5057e057bd3de6a' into eclair-mr2-plus-aosp
* commit '
6916255e3bc5760bcaac2ec7d5057e057bd3de6a':
Call into MimeTypeMap to get the mime type for an extension.
Patrick Scott [Wed, 13 Jan 2010 19:10:56 +0000 (14:10 -0500)]
Call into MimeTypeMap to get the mime type for an extension.
Use the default method to obtain the content type of a plugin. Implement
extension to mime type by calling into the java map.
Requires a small change to the webkit package.
Bug:
2368893
Cary Clark [Wed, 13 Jan 2010 13:30:03 +0000 (08:30 -0500)]
clip the cursor rings if occluded
Also, if a smaller object, like text, is drawn over a occluding rectangle,
ignore it, and don't reset the occluded state.
fixes http://b/
2319610
Grace Kloba [Wed, 13 Jan 2010 05:33:43 +0000 (21:33 -0800)]
Grace Kloba [Wed, 13 Jan 2010 01:14:42 +0000 (17:14 -0800)]
DO NOT MERGE.
Check the dimensions against 0 before using it to
calculate the ratio.
Fix http://b/issue?id=
2368862
Grace Kloba [Wed, 13 Jan 2010 02:34:31 +0000 (18:34 -0800)]
Leon Scroggins [Tue, 12 Jan 2010 22:24:15 +0000 (14:24 -0800)]
am
ddd2f469: am
ab9c9800: Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Merge commit '
ddd2f469835ed5402cb3edfa6c2865536011fbab'
* commit '
ddd2f469835ed5402cb3edfa6c2865536011fbab':
Compare Node pointers rather than CachedNode pointers.
Leon Scroggins [Tue, 12 Jan 2010 22:21:37 +0000 (14:21 -0800)]
am
ab9c9800: Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Merge commit '
ab9c9800ae22385fd019e1f6a366fc5346d041aa' into eclair-mr2-plus-aosp
* commit '
ab9c9800ae22385fd019e1f6a366fc5346d041aa':
Compare Node pointers rather than CachedNode pointers.
Leon Scroggins [Tue, 12 Jan 2010 22:17:03 +0000 (14:17 -0800)]
Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Steve Block [Tue, 12 Jan 2010 21:10:51 +0000 (13:10 -0800)]
Merge "resolved conflicts for merge of
e0286f66 to master"
Steve Block [Tue, 12 Jan 2010 20:30:31 +0000 (20:30 +0000)]
resolved conflicts for merge of
e0286f66 to master
Change-Id: I6efcacf082170506048d0a2caf3d669796fc4253
Leon Scroggins [Tue, 12 Jan 2010 20:42:27 +0000 (15:42 -0500)]
Compare Node pointers rather than CachedNode pointers.
Fixes http://b/issue?id=
2369028
Derek Sollenberger [Tue, 12 Jan 2010 20:31:34 +0000 (12:31 -0800)]
am
8752c4d3: am
f8ffa7ae: Merge "adding event to notify the plugin when it is on/off screen." into eclair-mr2
Merge commit '
8752c4d3c7d623f1f6314e8b662d3626c849ca97'
* commit '
8752c4d3c7d623f1f6314e8b662d3626c849ca97':
adding event to notify the plugin when it is on/off screen.
Leon Scroggins [Tue, 12 Jan 2010 20:31:29 +0000 (12:31 -0800)]
am
4843cf01: am
9fb6b3c3: Ensure that the current textfield is actually a textfield before treating it like one.
Merge commit '
4843cf010e538098e485802576b5a16d7f5cb5f1'
* commit '
4843cf010e538098e485802576b5a16d7f5cb5f1':
Ensure that the current textfield is actually a textfield before treating it like one.
Derek Sollenberger [Tue, 12 Jan 2010 20:19:00 +0000 (12:19 -0800)]
am
f8ffa7ae: Merge "adding event to notify the plugin when it is on/off screen." into eclair-mr2
Merge commit '
f8ffa7aeb28d4325cdeb0d7bddcf9397d761f97f' into eclair-mr2-plus-aosp
* commit '
f8ffa7aeb28d4325cdeb0d7bddcf9397d761f97f':
adding event to notify the plugin when it is on/off screen.
Leon Scroggins [Tue, 12 Jan 2010 20:17:31 +0000 (12:17 -0800)]
am
9fb6b3c3: Ensure that the current textfield is actually a textfield before treating it like one.
Merge commit '
9fb6b3c382612e4284ca9bd38930ab94053b8888' into eclair-mr2-plus-aosp
* commit '
9fb6b3c382612e4284ca9bd38930ab94053b8888':
Ensure that the current textfield is actually a textfield before treating it like one.
Derek Sollenberger [Tue, 12 Jan 2010 20:12:11 +0000 (12:12 -0800)]
Merge "adding event to notify the plugin when it is on/off screen." into eclair-mr2
Steve Block [Tue, 12 Jan 2010 20:10:46 +0000 (12:10 -0800)]
am
8ed98e2e: When starting the Geolocation service provider, check that the WebView is not already paused.
Merge commit '
8ed98e2e3f77020f7a43bbd5427bc3dd12ba5743' into eclair-plus-aosp
* commit '
8ed98e2e3f77020f7a43bbd5427bc3dd12ba5743':
When starting the Geolocation service provider, check that the WebView is not already paused.
Leon Scroggins [Tue, 12 Jan 2010 19:38:39 +0000 (14:38 -0500)]
Ensure that the current textfield is actually a textfield before treating it like one.
Fix for http://b/issue?id=
2368868
Derek Sollenberger [Tue, 12 Jan 2010 19:08:24 +0000 (14:08 -0500)]
adding event to notify the plugin when it is on/off screen.
Andrei Popescu [Tue, 12 Jan 2010 16:17:31 +0000 (08:17 -0800)]
Merge "Implement timeupdate events for video tag."
Ben Murdoch [Tue, 12 Jan 2010 15:15:57 +0000 (07:15 -0800)]
Merge "Cherry pick from Webkit for fix for https://bugs.webkit.org/show_bug.cgi?id=31539."
Cary Clark [Mon, 11 Jan 2010 19:55:20 +0000 (14:55 -0500)]
rebuild the nav cache if the clicked on node is invalid
Before, the slop parameter was set to zero if the node was
invalid, and used to skip searching for the node. Now, the
cache is rebuilt on the java side before the C side is
called.
requires a companion fix in frameworks/base
fixes http://b/
2362334
Andrei Popescu [Mon, 11 Jan 2010 21:11:21 +0000 (21:11 +0000)]
Implement timeupdate events for video tag.
Fix http://b/issue?id=
2210105
Ben Murdoch [Tue, 12 Jan 2010 12:00:51 +0000 (12:00 +0000)]
Cherry pick from Webkit for fix for https://bugs.webkit.org/show_bug.cgi?id=31539.
Restore the default state of a textarea correctly.
Change-Id: Id182817b7cd229e12676fd5ef55657ff6a963a4f
Steve Block [Tue, 12 Jan 2010 00:18:58 +0000 (00:18 +0000)]
When starting the Geolocation service provider, check that the WebView is not already paused.
This fixes the following scenario ...
- The browser back stack contains a page which calls Geolocation::watchPosition form its onload handler.
- User presses the back button quickly and repeatedly until the browser goes to the background.
- The browser calls WebViewCore::Pause when it goes into the background, which suspends any Geolocation
services in use. However, this call is made before the page which calls Geolocation::watchPosition has
been loaded. WebKit later loads this page, which creates a new Geolocation object which is never paused.
With this fix, the new Geolocation object is not started when it is first created. It does nothing until
it is resumed when the Browser is brought back to the foreground.
Bug:
2363338
Derek Sollenberger [Mon, 11 Jan 2010 21:58:49 +0000 (13:58 -0800)]
Merge "resolved conflicts for merge of
ab89d1aa to master"
Derek Sollenberger [Mon, 11 Jan 2010 21:54:05 +0000 (16:54 -0500)]
resolved conflicts for merge of
ab89d1aa to master
Grace Kloba [Mon, 11 Jan 2010 21:50:35 +0000 (13:50 -0800)]
am
4ad9c9b7: (-s ours) am
237bd75b: First draft of multitouch in the WebView.
Merge commit '
4ad9c9b76f04defb3c0be94db5cf672322f53104'
* commit '
4ad9c9b76f04defb3c0be94db5cf672322f53104':
First draft of multitouch in the WebView.
Derek Sollenberger [Mon, 11 Jan 2010 21:11:22 +0000 (13:11 -0800)]
am
838afd1b: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '
838afd1be683057ebaf5cf85359bf9a567602b7b' into eclair-mr2-plus-aosp
* commit '
838afd1be683057ebaf5cf85359bf9a567602b7b':
consolidating to only use one surface per plugin. give plugin access to java context.
Derek Sollenberger [Mon, 11 Jan 2010 17:49:19 +0000 (12:49 -0500)]
consolidating to only use one surface per plugin. give plugin access to java context.
There is a companion commit in frameworks/base.
Grace Kloba [Mon, 11 Jan 2010 18:47:30 +0000 (10:47 -0800)]
am
237bd75b: First draft of multitouch in the WebView.
Merge commit '
237bd75b6ebc1298cbd1c46b43903d19d7dd18b1' into eclair-plus-aosp
* commit '
237bd75b6ebc1298cbd1c46b43903d19d7dd18b1':
First draft of multitouch in the WebView.
Andrei Popescu [Mon, 11 Jan 2010 16:03:30 +0000 (08:03 -0800)]
Merge "Update v8/bindings to remove the ANDROID #ifdefs and confirm that DOMData now officially has a virtual dtor."