OSDN Git Service
Derek Sollenberger [Mon, 25 Jan 2010 20:12:16 +0000 (15:12 -0500)]
Do not allow the plugin to show or hide the keyboard unless it has focus.
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: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 [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: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 02:59:05 +0000 (18:59 -0800)]
Merge "DO NOT MERGE" into eclair-mr2
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 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: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 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 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 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: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 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:05:46 +0000 (18:05 -0800)]
Don't use static jclass unless we hold a reference.
Fix the crash.
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 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: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: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: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: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: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 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 [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: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: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: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 16:49:50 +0000 (11:49 -0500)]
remove unused jni interfaces
companion change is in frameworks/base
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 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 19:46:12 +0000 (19:46 +0000)]
Revert to ENABLE_ORIENTATION_EVENTS=1
Nicolas Roard [Mon, 4 Jan 2010 19:33:17 +0000 (19:33 +0000)]
webkit layers support
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
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.
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
Android (Google) Code Review [Fri, 18 Dec 2009 10:11:06 +0000 (02:11 -0800)]
Merge change I49687314 into eclair-mr2
* changes:
Fixes a Geolocation bug with cached positions.
Steve Block [Tue, 15 Dec 2009 15:45:02 +0000 (15:45 +0000)]
Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Change-Id: Id7659cfcab17f24e48958086b4206b1906562d74
Steve Block [Wed, 16 Dec 2009 12:57:38 +0000 (12:57 +0000)]
Fixes a Geolocation bug with cached positions.
In the case where a watch request returns a cached position, we must clear the cached position to prevent it from being used repeatedly in the case where the watch timer later fires.
Also cleans up some code and adds some comments.
This will be upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=30676
Change-Id: I4968731453c3dfd34a8d3466fdaee91d4c4158be
Steve Block [Wed, 25 Nov 2009 18:46:40 +0000 (18:46 +0000)]
Merge webkit.org at r51976 : Update WebKit revision number.
Change-Id: I71ebb1ee90bbca9328a3c6ca30f0beaefebbede2
Steve Block [Thu, 26 Nov 2009 14:10:10 +0000 (14:10 +0000)]
Merge webkit.org at r51976 : ColorSpace type has been removed.
See the following WebKit changes ...
http://trac.webkit.org/changeset/50614
http://trac.webkit.org/changeset/51124
http://trac.webkit.org/changeset/51161
Change-Id: I690bb3aebc75b5a45396bb9bbcc4ee797ca3465b
Steve Block [Thu, 26 Nov 2009 16:08:52 +0000 (16:08 +0000)]
Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
See http://trac.webkit.org/changeset/50852
Change-Id: Ie6ddbe8da1ce7bc2dffbd57bb93aee5d5e9a1068
Steve Block [Wed, 9 Dec 2009 16:48:47 +0000 (16:48 +0000)]
Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
See http://trac.webkit.org/changeset/51801
Change-Id: I819c17c8609dd65799bd8a2245cc454e27271969
Steve Block [Wed, 9 Dec 2009 15:40:02 +0000 (15:40 +0000)]
Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
See http://trac.webkit.org/changeset/51212
Change-Id: I276253611ffe7518733fc7af51b0dfcc5f5d8691
Steve Block [Thu, 26 Nov 2009 21:00:59 +0000 (21:00 +0000)]
Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
See http://trac.webkit.org/changeset/50327
Change-Id: If8461f4f433a8addac9cd593f5f66571399a31bb
Steve Block [Wed, 9 Dec 2009 15:19:26 +0000 (15:19 +0000)]
Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
See http://trac.webkit.org/changeset/50923
Change-Id: I8c7bb8af6e40fd449e27f28ff0d2e58fbb4d9eb3
Steve Block [Thu, 26 Nov 2009 14:21:22 +0000 (14:21 +0000)]
Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
See http://trac.webkit.org/changeset/50760
Change-Id: I50c0864b1347e81839b8276a832311d7d1281148
Steve Block [Thu, 26 Nov 2009 13:10:36 +0000 (13:10 +0000)]
Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
See http://trac.webkit.org/changeset/50632
Change-Id: I3b10aff021d89b66d4d3d5f52773e4922654fbfa
Steve Block [Wed, 9 Dec 2009 15:16:27 +0000 (15:16 +0000)]
Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
See http://trac.webkit.org/changeset/50605
Change-Id: Iaad2055f169f56b7d43e2e3195041f0796506092
Steve Block [Wed, 9 Dec 2009 15:01:27 +0000 (15:01 +0000)]
Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
See http://trac.webkit.org/changeset/51644
Change-Id: I539af311723c20648d4958c46ee3ebe502e680b8
Steve Block [Wed, 9 Dec 2009 14:47:50 +0000 (14:47 +0000)]
Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
See http://trac.webkit.org/changeset/50973
Change-Id: I54093cd917f15a51412b07b5495f32502cfd23b5
Steve Block [Wed, 9 Dec 2009 14:40:12 +0000 (14:40 +0000)]
Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
See http://trac.webkit.org/changeset/50351
Change-Id: Ia3fa68ebb7f54b3a88635c9e8ebade0180a62e21
Steve Block [Wed, 9 Dec 2009 14:36:06 +0000 (14:36 +0000)]
Merge webkit.org at r51976 : Changes to InspectorController.
See http://trac.webkit.org/changeset/51631
Change-Id: Ic0973105e04df1023d4df6f6e1d20052e869ac4a
Steve Block [Thu, 26 Nov 2009 12:12:20 +0000 (12:12 +0000)]
Merge webkit.org at r51976 : Fix Makefiles.
Change-Id: I7d9d5788efda1d0e985242ab03c8016069798acd
Steve Block [Tue, 15 Dec 2009 11:15:20 +0000 (11:15 +0000)]
Merge webkit.org at r51976 : Fix general conflicts.
Notes ...
For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644
For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636
For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257
For Geolocation.cpp, see http://trac.webkit.org/changeset/50605
For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004
For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523
For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996
For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465
Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial.
Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
Steve Block [Tue, 15 Dec 2009 11:09:43 +0000 (11:09 +0000)]
Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858
and http://trac.webkit.org/changeset/51926
Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
Steve Block [Tue, 15 Dec 2009 10:12:09 +0000 (10:12 +0000)]
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Mike Reed [Thu, 17 Dec 2009 16:10:47 +0000 (11:10 -0500)]
register the eventinterface with our dispatcher list
Android (Google) Code Review [Wed, 16 Dec 2009 22:11:38 +0000 (14:11 -0800)]
Merge change Ifcce71fa into eclair-mr2
* changes:
Implement the full screen WebView plugin.
Grace Kloba [Wed, 16 Dec 2009 19:39:26 +0000 (11:39 -0800)]
Implement the full screen WebView plugin.
Use a NoTitleBar_Fullscreen dialog to implement the
full screen plugin. This runs in the same thread as
WebView (UI in the Browser case). One catch is that
the SurfaceView provided by the plugin needs to be
opaque if it doesn't want to see through the WebView.
The PluginFullScreenHolder translates the events to
the underline WebView. Special treatment in the touch
case as it needs to translate the coordinates.
WebView can't be panned, or double tap to zoom, or
long press to trigger the context menu while having
a full screen plugin.
Inside webkit, we also give the plugin element focus
when it goes to the full screen so that it takes key
events. While handling key events, we don't let it
loose focus or scroll out.
Todo:
When a plugin goes to full screen, we should make
sure the embedded plugin is fully visible. Otherwise
when we translate the touch events back, they will be
outside of the visible rect and will be ignored.
This is part 2 of 2-project check in.
Patrick Scott [Tue, 15 Dec 2009 20:34:48 +0000 (15:34 -0500)]
Fix the benchmark app yet again to work in mr2 (and master).
The signature of startLoadingResource changed. The PageCache can change the
FrameView so don't use the local one. Add a few more function intercepts in the
fake vm.
Cary Clark [Fri, 11 Dec 2009 17:50:10 +0000 (12:50 -0500)]
check to see if nav cache is up to date on tap
- WebKit/android/jni/WebViewCore.cpp
- WebKit/android/jni/WebViewCore.h
Add validNodeAndBounds() to determine if the clicked cached
node is good. First check to see if the pointer
to the frame and node still exist in the DOM. If
they do, see if the hit test bounds they point
to is the same as when the cache was recorded.
- WebKit/android/nav/CacheBuilder.cpp
- WebKit/android/nav/CachedNode.h
Record the original absolute bounds for later
comparison.
- WebKit/android/nav/CacheBuilder.h
Make getAreaRect() public so it can be called by
validation.
- WebKit/android/nav/WebView.cpp
Enhance motionUp() with additional validation:
use pointInNavCache() to see if there's a cached node;
wait for message from webkit to see if bounds is unchanged;
then use motionUp() to pass the original or altered click.
This is a two-part change with frameworks/base.
Fixes http://b/
2249425
Leon Scroggins [Fri, 11 Dec 2009 20:12:12 +0000 (15:12 -0500)]
Provide localized strings for <input> labels.
Fix for http://b/issue?id=
2178786
Call up to Java to get strings for <input> labels, and use them
on inputs.
Requires a change in frameworks/base.
Andrei Popescu [Tue, 15 Dec 2009 12:26:47 +0000 (12:26 +0000)]
Do not merge
Replicate https://android-git.corp.google.com/g/#change,35704 to mr2
to leave this branch in a sane state. Otherwise, the browser crashes on startup.
Android (Google) Code Review [Mon, 14 Dec 2009 19:41:37 +0000 (11:41 -0800)]
Merge change Ic29b39b8 into eclair-mr2
* changes:
Replace the C-cast used to determine whether the resource handle represent the main resource.
Andrei Popescu [Mon, 14 Dec 2009 12:45:34 +0000 (12:45 +0000)]
Replace the C-cast used to determine whether the resource handle represent the main resource.
Fix style to match webkit style.
Derek Sollenberger [Tue, 8 Dec 2009 20:44:57 +0000 (15:44 -0500)]
Notify native plugin code when the browser discards the customView.
Grace Kloba [Fri, 11 Dec 2009 21:53:22 +0000 (13:53 -0800)]
Rollback to return density for scaleFactor.
Move the comment to HTMLCanvasElement and always use 1.0 there.
Andrei Popescu [Tue, 8 Dec 2009 18:37:43 +0000 (18:37 +0000)]
Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.
Android (Google) Code Review [Fri, 11 Dec 2009 16:41:57 +0000 (08:41 -0800)]
Merge change I6efdd453 into eclair-mr2
* changes:
Fix the crash in RenderTableSection for Small Screen rendering. The code path was not exercised in the Browser and the crash was triggered by the WebKit integration.
Grace Kloba [Fri, 11 Dec 2009 00:18:32 +0000 (16:18 -0800)]
Fix the crash in RenderTableSection for Small Screen
rendering. The code path was not exercised in the
Browser and the crash was triggered by the WebKit
integration.
Fix http://b/issue?id=
2285748
Android (Google) Code Review [Thu, 10 Dec 2009 21:20:25 +0000 (13:20 -0800)]
Merge change I514e3218 into eclair-mr2
* changes:
add event interface for plugins, so they can post an event to themselves (from any thread)
Mike Reed [Thu, 10 Dec 2009 16:36:37 +0000 (11:36 -0500)]
add event interface for plugins, so they can post an event to themselves (from any thread)
Mike Reed [Thu, 10 Dec 2009 19:31:40 +0000 (14:31 -0500)]
fix sim build: only issue -Wno-psabi if we building for arm
Mike Reed [Thu, 10 Dec 2009 16:35:25 +0000 (11:35 -0500)]
remove 100s of warnings about va_list mangling in GCC 4.4
On branch warning
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: Android.mk
Android (Google) Code Review [Thu, 10 Dec 2009 11:31:00 +0000 (03:31 -0800)]
Merge change Ice11d745 into eclair-mr2
* changes:
Removes superfluous SocketStreamHandleBase.cpp from Android build.