OSDN Git Service
Derek Sollenberger [Mon, 25 Jan 2010 19:31:04 +0000 (11:31 -0800)]
am
c45f962c: Merge "Correcting how the plugin\'s bounding coordinates are computed." into eclair-mr2
Merge commit '
c45f962cdbdd4a870b7af94ce48f48e36c5b53cb' into eclair-mr2-plus-aosp
* commit '
c45f962cdbdd4a870b7af94ce48f48e36c5b53cb':
Correcting how the plugin's bounding coordinates are computed.
Derek Sollenberger [Mon, 25 Jan 2010 19:24:46 +0000 (11:24 -0800)]
Merge "Correcting how the plugin's bounding coordinates are computed." into eclair-mr2
Derek Sollenberger [Mon, 25 Jan 2010 15:10:50 +0000 (10:10 -0500)]
Correcting how the plugin's bounding coordinates are computed.
Grace Kloba [Mon, 25 Jan 2010 18:28:52 +0000 (10:28 -0800)]
am
f7dbff09: Merge "Rearrange the include headers to enable logging." into eclair-mr2
Merge commit '
f7dbff09c8d416459a317e397e0a46c197dbf862' into eclair-mr2-plus-aosp
* commit '
f7dbff09c8d416459a317e397e0a46c197dbf862':
Rearrange the include headers to enable logging.
Grace Kloba [Mon, 25 Jan 2010 18:21:31 +0000 (10:21 -0800)]
Merge "Rearrange the include headers to enable logging." into eclair-mr2
Grace Kloba [Mon, 25 Jan 2010 17:21:10 +0000 (09:21 -0800)]
Rearrange the include headers to enable logging.
Derek Sollenberger [Mon, 25 Jan 2010 15:22:37 +0000 (07:22 -0800)]
am
2eb76d0b: Add logging for all plugin events and their return values.
Merge commit '
2eb76d0bcdf5cdc45cf6188c8bb76a409612235b' into eclair-mr2-plus-aosp
* commit '
2eb76d0bcdf5cdc45cf6188c8bb76a409612235b':
Add logging for all plugin events and their return values.
Derek Sollenberger [Fri, 22 Jan 2010 19:40:05 +0000 (14:40 -0500)]
Add logging for all plugin events and their return values.
Grace Kloba [Fri, 22 Jan 2010 03:27:06 +0000 (19:27 -0800)]
am
ec4b5ee4: As we are sharing the view between embedded and full screen, we should make sure to call the correct update when bounds changed.
Merge commit '
ec4b5ee43c88d914221e8c9f668421ace6bdd72d' into eclair-mr2-plus-aosp
* commit '
ec4b5ee43c88d914221e8c9f668421ace6bdd72d':
As we are sharing the view between embedded and full
Grace Kloba [Fri, 22 Jan 2010 03:13:23 +0000 (19:13 -0800)]
As we are sharing the view between embedded and full
screen, we should make sure to call the correct
update when bounds changed.
This should fix the crash when changing orientation.
Grace Kloba [Thu, 21 Jan 2010 03:01:48 +0000 (19:01 -0800)]
am
0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '
0a3f01ac5e5855c3563694671091d4c1ce89cac5' into eclair-mr2-plus-aosp
* commit '
0a3f01ac5e5855c3563694671091d4c1ce89cac5':
DO NOT MERGE
Grace Kloba [Thu, 21 Jan 2010 02:59:05 +0000 (18:59 -0800)]
Merge "DO NOT MERGE" into eclair-mr2
Grace Kloba [Thu, 21 Jan 2010 02:58:19 +0000 (18:58 -0800)]
am
72acb46d: Fix the crash of exiting full screen by checking null.
Merge commit '
72acb46d81f6f3c7015109c925762dcc7fa12802' into eclair-mr2-plus-aosp
* commit '
72acb46d81f6f3c7015109c925762dcc7fa12802':
Fix the crash of exiting full screen by checking null.
Grace Kloba [Thu, 21 Jan 2010 02:56:54 +0000 (18:56 -0800)]
DO NOT MERGE
Apparently ownerElement is not a good way to check
when it is the top document in detach().
This should fix the touch problem in the plugin in
www.excite.com.
This doesn't need to be merged as touch as been updated
to match the webkit.
Grace Kloba [Thu, 21 Jan 2010 02:19:19 +0000 (18:19 -0800)]
Fix the crash of exiting full screen by checking null.
When we exit full screen, we place the embedded
view on the screen, so we need to destroy it again
in the destructor
Grace Kloba [Wed, 20 Jan 2010 16:53:00 +0000 (08:53 -0800)]
am
1f15f3a9: Changing plugin setwindow() to use page coordinate instead of frame as it is what Flash expects. For other port like Mac, it passes the window coordinate to the plugin. In Android, plugin always sees the full page and we use the visible screen rect to ind
Merge commit '
1f15f3a9f6dc2a169bbd160e2e1abb161f9927d9' into eclair-mr2-plus-aosp
* commit '
1f15f3a9f6dc2a169bbd160e2e1abb161f9927d9':
Changing plugin setwindow() to use page coordinate
Grace Kloba [Wed, 20 Jan 2010 03:00:16 +0000 (19:00 -0800)]
Changing plugin setwindow() to use page coordinate
instead of frame as it is what Flash expects. For
other port like Mac, it passes the window coordinate
to the plugin. In Android, plugin always sees the
full page and we use the visible screen rect to
indicate whether it is visible.
Change to use page coordinate across PluginView and
PluginWidget for consistency. This should fix the
problem Ben saw with plugin inside iframe (which is
caused by a race condition) and the cnnn ad problem
Adobe has.
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: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
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: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 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: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 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.
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: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)
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 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 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
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
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
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: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
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.
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.
Leon Scroggins [Mon, 11 Jan 2010 14:42:24 +0000 (06:42 -0800)]
am
d485d47c: Bring up the IME after receiving a response from webkit.
Merge commit '
d485d47cbb03ae8cbe9d96bc54a5cb83ee80570e' into eclair-mr2-plus-aosp
* commit '
d485d47cbb03ae8cbe9d96bc54a5cb83ee80570e':
Bring up the IME after receiving a response from webkit.
Leon Scroggins [Fri, 8 Jan 2010 21:22:09 +0000 (16:22 -0500)]
Bring up the IME after receiving a response from webkit.
Fix for http://b/issue?id=
2361658
Requires a change to frameworks/base.
Steve Block [Fri, 8 Jan 2010 17:18:06 +0000 (09:18 -0800)]
am
ee0e4a35: Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Merge commit '
ee0e4a35152a822ebac039808db1a4c33f02f7ee' into eclair-mr2-plus-aosp
* commit '
ee0e4a35152a822ebac039808db1a4c33f02f7ee':
Updates the use of weak references in the script-to-Java bridge for V8.
Steve Block [Fri, 8 Jan 2010 17:15:31 +0000 (09:15 -0800)]
Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Steve Block [Fri, 18 Dec 2009 12:28:23 +0000 (12:28 +0000)]
Updates the use of weak references in the script-to-Java bridge for V8.
Currently, V8 uses weak references to the Java object owned by JObjectWrapper.
This is in contrast to JSC, which uses strong references in JObjectWrapper.
However, for the special-case where JObjectWrapper is used in JavaInstance in
WebCoreFrameBridge, JSC uses WeakJavaInstance to swap the strong references for
weak references.
This change updates the V8 version of JObjectWrapper to use strong references
to match the JSC version. To maintain the weak reference behavior where
JObjectWrapper is used in JavaInstance in WebCoreFrameBridge, V8 now make use of
WeakJavaInstance too. This requires changes to jni_npobject to call the
necessary methods on JavaInstance to swap the references when the object is
accessed.
Change-Id: I3724d7e6437588feb0268a2670b02a93b52e54f0
Steve Block [Fri, 8 Jan 2010 12:49:11 +0000 (04:49 -0800)]
am
5cf18d3a: Merge "Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods." into eclair-mr2
Merge commit '
5cf18d3a4942dd7fba1f03621d53d66412b1b3df' into eclair-mr2-plus-aosp
* commit '
5cf18d3a4942dd7fba1f03621d53d66412b1b3df':
Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.
Steve Block [Fri, 8 Jan 2010 12:41:56 +0000 (04:41 -0800)]
Merge "Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods." into eclair-mr2
Leon Scroggins [Thu, 7 Jan 2010 20:38:02 +0000 (12:38 -0800)]
am
15f1e443: In motionUp, update the CachedHistory\'s mMouseBounds.
Merge commit '
15f1e443f22288ee82cde972517ebf3cc1153d97' into eclair-mr2-plus-aosp
* commit '
15f1e443f22288ee82cde972517ebf3cc1153d97':
In motionUp, update the CachedHistory's mMouseBounds.
Leon Scroggins [Thu, 7 Jan 2010 20:19:19 +0000 (15:19 -0500)]
In motionUp, update the CachedHistory's mMouseBounds.
mMouseBounds is later used to determine the point of clicking.
Fixes http://b/issue?id=
2313991
Cary Clark [Thu, 7 Jan 2010 18:20:08 +0000 (10:20 -0800)]
am
1ccac4c1: remove unused jni interfaces
Merge commit '
1ccac4c182607275cdb16213493afa414f0d365e' into eclair-mr2-plus-aosp
* commit '
1ccac4c182607275cdb16213493afa414f0d365e':
remove unused jni interfaces
Cary Clark [Thu, 7 Jan 2010 16:49:50 +0000 (11:49 -0500)]
remove unused jni interfaces
companion change is in frameworks/base
Leon Scroggins [Thu, 7 Jan 2010 13:46:34 +0000 (05:46 -0800)]
am
725b72d9: Request <label> info only when accessing a textfield.
Merge commit '
725b72d96731765ddc964c620a2c98834946241f' into eclair-mr2-plus-aosp
* commit '
725b72d96731765ddc964c620a2c98834946241f':
Request <label> info only when accessing a textfield.
Leon Scroggins [Wed, 6 Jan 2010 22:06:11 +0000 (17:06 -0500)]
Request <label> info only when accessing a textfield.
Previously, we were storing the label info each time we build the
navigation cache.
Requires a change to frameworks/base.
Leon Scroggins [Wed, 6 Jan 2010 21:46:16 +0000 (13:46 -0800)]
am
e5e9720d: In findBestHitAt, set x and y to the intersection of slop and cursor.
Merge commit '
e5e9720d88df20ad1116d709ec078cec419ffcf4' into eclair-mr2-plus-aosp
* commit '
e5e9720d88df20ad1116d709ec078cec419ffcf4':
In findBestHitAt, set x and y to the intersection of slop and cursor.
Leon Scroggins [Wed, 6 Jan 2010 21:46:10 +0000 (13:46 -0800)]
am
62d9c8e5: Store label information to be used for hint text.
Merge commit '
62d9c8e597ebe68adce93008597730a41a1d716b' into eclair-mr2-plus-aosp
* commit '
62d9c8e597ebe68adce93008597730a41a1d716b':
Store label information to be used for hint text.
Leon Scroggins [Wed, 6 Jan 2010 15:49:08 +0000 (10:49 -0500)]
In findBestHitAt, set x and y to the intersection of slop and cursor.
Fixes http://b/issue?id=
2201866
Leon Scroggins [Tue, 5 Jan 2010 15:56:57 +0000 (10:56 -0500)]
Store label information to be used for hint text.
Fix for http://b/issue?id=
2331526
Requires a change to frameworks/base.
Nicolas Roard [Mon, 4 Jan 2010 20:38:43 +0000 (12:38 -0800)]
am
3bacb88b: Revert to ENABLE_ORIENTATION_EVENTS=1
Merge commit '
3bacb88ba1ca0b7bbce5b16b832cc5acd411e1f9' into eclair-mr2-plus-aosp
* commit '
3bacb88ba1ca0b7bbce5b16b832cc5acd411e1f9':
Revert to ENABLE_ORIENTATION_EVENTS=1
Nicolas Roard [Mon, 4 Jan 2010 19:46:12 +0000 (19:46 +0000)]
Revert to ENABLE_ORIENTATION_EVENTS=1
Nicolas Roard [Mon, 4 Jan 2010 19:41:10 +0000 (11:41 -0800)]
am
9acd586e: webkit layers support
Merge commit '
9acd586e4a0aa54e4f630665aa0d3c8c95b78e72' into eclair-mr2-plus-aosp
* commit '
9acd586e4a0aa54e4f630665aa0d3c8c95b78e72':
webkit layers support
Nicolas Roard [Mon, 4 Jan 2010 19:33:17 +0000 (19:33 +0000)]
webkit layers support
Leon Scroggins [Mon, 4 Jan 2010 15:33:11 +0000 (07:33 -0800)]
am
5bd553b6: Merge "If the DOM changes textfield focus, make the IME work properly." into eclair-mr2
Merge commit '
5bd553b63661fa0f711bb9c02566d5df80a9432f' into eclair-mr2-plus-aosp
* commit '
5bd553b63661fa0f711bb9c02566d5df80a9432f':
If the DOM changes textfield focus, make the IME work properly.
Steve Block [Mon, 4 Jan 2010 15:31:12 +0000 (07:31 -0800)]
am
edb4aa51: Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Merge commit '
edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0' into eclair-mr2-plus-aosp
* commit '
edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0':
Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
Leon Scroggins [Mon, 4 Jan 2010 15:27:55 +0000 (07:27 -0800)]
Merge "If the DOM changes textfield focus, make the IME work properly." into eclair-mr2
Steve Block [Mon, 4 Jan 2010 15:20:25 +0000 (07:20 -0800)]
Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Steve Block [Mon, 4 Jan 2010 12:50:03 +0000 (12:50 +0000)]
Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
WebKit change http://trac.webkit.org/changeset/51975 modified String addition in
JSC to use ropes. However, the change was incorrect, so was rolled back in
http://trac.webkit.org/changeset/51978.
The last WebKit merge was to revision r51976, so picked up the initial, broken
change only.
This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the
original change.
Bug:
2336856
Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990
Leon Scroggins [Tue, 15 Dec 2009 21:33:28 +0000 (16:33 -0500)]
If the DOM changes textfield focus, make the IME work properly.
Fix for http://b/issue?id=
2219166
Requires a change to frameworks/base
Remove the old change to update the WebTextView when a key is pressed,
since the IME does not generate key events. Instead, when the focus
changes, and the IME is serving the WebTextView, immediately clear
the cursor and update the WebTextView, so the user can continue
typing. Also, allow "Next" to work on the currently focused
textfield, even if it's not the cursor. Further, check for
a new action if there is a focus but not a cursor.
Steve Block [Wed, 30 Dec 2009 13:37:15 +0000 (13:37 +0000)]
Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.
Change-Id: I9cc775224edcda65884461eaf0f4ff7efb5922be
Derek Sollenberger [Fri, 18 Dec 2009 16:49:14 +0000 (08:49 -0800)]
am
626f2058: Merge change Iab49f046 into eclair-mr2
Merge commit '
626f2058a8302d9e9770d3df2f9677344adb02d9' into eclair-mr2-plus-aosp
* commit '
626f2058a8302d9e9770d3df2f9677344adb02d9':
Fix to ensure plugin is notified even when the screen width does not change.
Android (Google) Code Review [Fri, 18 Dec 2009 16:46:32 +0000 (08:46 -0800)]
Merge change Iab49f046 into eclair-mr2
* changes:
Fix to ensure plugin is notified even when the screen width does not change.
Steve Block [Fri, 18 Dec 2009 14:44:02 +0000 (06:44 -0800)]
am
84a47995: Merge change I21d39461 into eclair-mr2
Merge commit '
84a4799558b021d8ab6c19a7fa787e2731aa1fe3' into eclair-mr2-plus-aosp
* commit '
84a4799558b021d8ab6c19a7fa787e2731aa1fe3':
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Android (Google) Code Review [Fri, 18 Dec 2009 14:41:41 +0000 (06:41 -0800)]
Merge change I21d39461 into eclair-mr2
* changes:
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Derek Sollenberger [Fri, 18 Dec 2009 14:01:01 +0000 (09:01 -0500)]
Fix to ensure plugin is notified even when the screen width does not change.
Steve Block [Fri, 18 Dec 2009 12:22:36 +0000 (12:22 +0000)]
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Also fixes some style issues.
Change-Id: I21d39461b488a5f490ea3557b24fe1674903c286
Steve Block [Fri, 18 Dec 2009 10:15:04 +0000 (02:15 -0800)]
am
6c4eb7eb: Merge change I49687314 into eclair-mr2
Merge commit '
6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6' into eclair-mr2-plus-aosp
* commit '
6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6':
Fixes a Geolocation bug with cached positions.