OSDN Git Service
Andrei Popescu [Wed, 13 Jan 2010 18:43:00 +0000 (18:43 +0000)]
Prepare NPV8Object.h/cpp for upstreaming:
- remove #include bindings/npruntime.h from NPV8Object.cpp since that's also included in the NPV8Object.h
- add ARRAYSIZE_UNSAFE macro
- remove some TODOS
This will be checked in after the corresponding webkit bug gets landed.
See https://bugs.webkit.org/show_bug.cgi?id=33608
Andrei Popescu [Mon, 25 Jan 2010 11:38:53 +0000 (03:38 -0800)]
Merge "Prepare ScriptController class for upstreaming."
Andrei Popescu [Mon, 25 Jan 2010 11:38:47 +0000 (03:38 -0800)]
Merge "Remove Android-specific TODOs as the changes have been upstreamed in"
Leon Scroggins [Fri, 22 Jan 2010 16:32:42 +0000 (11:32 -0500)]
Call nextTextfield on the CachedFrame that contains the cursor/focus.
Fixes http://b/issue?id=
2359748
Andrei Popescu [Fri, 22 Jan 2010 15:14:56 +0000 (15:14 +0000)]
Remove Android-specific TODOs as the changes have been upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=33944
Andrei Popescu [Thu, 14 Jan 2010 15:33:28 +0000 (15:33 +0000)]
Prepare ScriptController class for upstreaming.
Move the code to obtain the NPObject ptr associated with a PluginView to the PlatformBridge.
This change will be submitted as soon as the patch in
https://bugs.webkit.org/show_bug.cgi?id=33673
lands upstream.
Grace Kloba [Fri, 22 Jan 2010 03:40:14 +0000 (19:40 -0800)]
am
de7e9124: 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 '
de7e9124bea659d873d5488809d92a334104cb53'
* commit '
de7e9124bea659d873d5488809d92a334104cb53':
As we are sharing the view between embedded and full
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 [Fri, 22 Jan 2010 01:57:57 +0000 (17:57 -0800)]
Grace Kloba [Thu, 21 Jan 2010 23:05:04 +0000 (15:05 -0800)]
Merge commit '
db0b7b50' into merge
Grace Kloba [Thu, 21 Jan 2010 21:52:03 +0000 (13:52 -0800)]
Merge commit '
91d051d3' into tmp
Derek Sollenberger [Thu, 21 Jan 2010 20:04:15 +0000 (15:04 -0500)]
Removing reference to a java object that is no longer used.
The native plugin code was creating a java object that was
intended to by used by the old Gears code. The java object
has been deprecated and is not being used within the native
code.
Steve Block [Thu, 21 Jan 2010 18:38:22 +0000 (10:38 -0800)]
Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4ed
* changes:
Fixes style in V8 jni_runtime.[cpp|h]
Updates V8 version of JavaString to use a private implementation class.
Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style
Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style
Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC
Steve Block [Thu, 21 Jan 2010 16:35:56 +0000 (16:35 +0000)]
Fixes style in V8 jni_runtime.[cpp|h]
This change makes it far easier to compare these files with WebCore/bridge/jni/Bridge.[cpp|h],
with which these files will eventually be merged.
Change-Id: I1b4ba9843f61c909568f85c65a0872a36d727fb3
Steve Block [Wed, 20 Jan 2010 13:20:50 +0000 (13:20 +0000)]
Updates V8 version of JavaString to use a private implementation class.
WebKit change http://trac.webkit.org/changeset/53449 moved the JSC-specific implementation
of JavaString to JavaStringJSC.h. This is the V8 equivalent of that change.
This is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33953
Change-Id: I6cadc4f4f941aab900aeaf3251a5cad77d050b9b
Steve Block [Thu, 21 Jan 2010 15:58:20 +0000 (15:58 +0000)]
Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style
Change-Id: Icf99c709929ef14551de61e55780b97767575f01
Steve Block [Thu, 21 Jan 2010 15:36:39 +0000 (15:36 +0000)]
Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style
This is the V8 equivalent of http://trac.webkit.org/changeset/53412
It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33951
Change-Id: Id22d59b7a5e0be72d594d454bb41c58760d824ff
Ben Murdoch [Thu, 21 Jan 2010 17:51:37 +0000 (09:51 -0800)]
Merge "Refactor style of Android specific touch events code in preparation for upstreaming to webkit.org."
Ben Murdoch [Thu, 21 Jan 2010 12:24:38 +0000 (12:24 +0000)]
Refactor style of Android specific touch events code in preparation for upstreaming to webkit.org.
Change-Id: Id34e727145fe94e98e62a36b7fc8256468b4157c
Steve Block [Thu, 21 Jan 2010 13:55:11 +0000 (05:55 -0800)]
Merge "Cherry-pick WebKit change 53619 to fix style in JNIBridge"
Steve Block [Thu, 21 Jan 2010 13:54:50 +0000 (05:54 -0800)]
Merge "Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge"
Steve Block [Thu, 21 Jan 2010 11:40:34 +0000 (11:40 +0000)]
Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC
See http://trac.webkit.org/changeset/53620
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Note that changes to WebCore.xcodeproj were not pulled, as they introduced merge conflicts.
Change-Id: I63f3c4ed101badaea3207d53784de04aee49c2ab
Steve Block [Thu, 21 Jan 2010 11:25:18 +0000 (11:25 +0000)]
Cherry-pick WebKit change 53619 to fix style in JNIBridge
See http://trac.webkit.org/changeset/53619
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: Ic34c760d412b022935a8770cc4b842619c008f15
Steve Block [Thu, 21 Jan 2010 11:23:07 +0000 (11:23 +0000)]
Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge
See http://trac.webkit.org/changeset/53557
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I9a74b4dbdb0a9580372d69cec9e8f9fcab750e49
Grace Kloba [Thu, 21 Jan 2010 03:15:33 +0000 (19:15 -0800)]
am
bfcc13fc: (-s ours) am
0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '
bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9'
* commit '
bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9':
DO NOT MERGE
Grace Kloba [Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)]
am
67c90537: am
72acb46d: Fix the crash of exiting full screen by checking null.
Merge commit '
67c90537fc70147ad8943f0a2cd02def405bcf8f'
* commit '
67c90537fc70147ad8943f0a2cd02def405bcf8f':
Fix the crash of exiting full screen by checking null.
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 19:26:21 +0000 (11:26 -0800)]
resolved conflicts for merge of
9dabd572 to master
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 15:58:24 +0000 (15:58 +0000)]
Rename V8 jni_utility_private to JNIUtilityPrivate and fixes style
This is the V8 equivalent of http://trac.webkit.org/changeset/51756
It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33901
Change-Id: I336687e546748a7823f5e2d18f1ac1112a30a60c
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
Grace Kloba [Tue, 19 Jan 2010 07:43:43 +0000 (23:43 -0800)]
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 [Fri, 15 Jan 2010 22:30:59 +0000 (14:30 -0800)]
DO NOT MERGE
When the hit result node has zero width, we can't
use it. Try its parents.
This happens in the story inside nytimes.com. They
use a special <nyt_text> tag. If it is the hit point,
it has 0 width and height.
Fix http://b/issue?id=
2363260
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 03:31:12 +0000 (19:31 -0800)]
am
e32bb876: Revert https://android-git.corp.google.com/g/37444 as https://android-git.corp.google.com/g/37486 is a better fix for b/issue?id=
2375232
Merge commit '
e32bb87640c16f2414a3f35cefd3c4146a174091' into eclair-plus-aosp
* commit '
e32bb87640c16f2414a3f35cefd3c4146a174091':
Revert https://android-git.corp.google.com/g/37444
Grace Kloba [Fri, 15 Jan 2010 02:57:58 +0000 (18:57 -0800)]
Revert https://android-git.corp.google.com/g/37444
as https://android-git.corp.google.com/g/37486
is a better fix for http://b/issue?id=
2375232
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.
Grace Kloba [Fri, 15 Jan 2010 01:07:37 +0000 (17:07 -0800)]
am
9f20cbf5: For mobile site, allow text wrap to screen if scale is not same as screen width scale.
Merge commit '
9f20cbf56188e83d4a3a631aba9607697ebac6c0' into eclair-plus-aosp
* commit '
9f20cbf56188e83d4a3a631aba9607697ebac6c0':
For mobile site, allow text wrap to screen if scale
Grace Kloba [Fri, 15 Jan 2010 00:22:56 +0000 (16:22 -0800)]
For mobile site, allow text wrap to screen if scale
is not same as screen width scale.
Fix http://b/issue?id=
2375232
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.