summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Cherry-pick WebKit change 53489 to fix style in JavaClassJSC." into ↵Steve Block2010-01-203-47/+60
|\ | | | | | | eclair-mr2
| * Cherry-pick WebKit change 53489 to fix style in JavaClassJSC.Steve Block2010-01-203-47/+60
| | | | | | | | | | | | | | 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
* | Merge changes I61cfea19,Ib2fe7793 into eclair-mr2Steve Block2010-01-2049-147/+316
|\ \ | |/ | | | | | | | | * 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
| * Cherry-pick WebKit change 53449 to move JSC-specific implementation of ↵Steve Block2010-01-195-41/+141
| | | | | | | | | | | | | | | | | | 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
| * Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-1946-106/+175
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Exit the fullscreen mode when the PluginWidget isGrace Kloba2010-01-192-1/+9
|/ | | destroyed.
* Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSCSteve Block2010-01-197-15/+33
| | | | | | | 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
* Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSCSteve Block2010-01-198-169/+191
| | | | | | | | | | | | 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
* Merge "Cherry-pick WebKit change 53412 to move jni_instance to ↵Steve Block2010-01-199-18/+38
|\ | | | | | | JavaInstanceJSC" into eclair-mr2
| * Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-199-18/+38
| | | | | | | | | | | | | | | | 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
* | Merge "Should check the enable plugin settings before accepting the plugin ↵Grace Kloba2010-01-181-1/+4
|\ \ | | | | | | | | | mimetypes." into eclair-mr2
| * | Should check the enable plugin settings before acceptingGrace Kloba2010-01-181-1/+4
| | | | | | | | | the plugin mimetypes.
* | | Don't call setNPWindowRect unless the plugin hasGrace Kloba2010-01-181-1/+1
|/ / | | | | | | started. Otherwise the plugin won't get the rect later as it thinks it is not changed.
* | Don't use static jclass unless we hold a reference.Grace Kloba2010-01-141-14/+9
| | | | | | Fix the crash.
* | Add proper support for fixed position elementsNicolas Roard2010-01-144-26/+65
| | | | | | | | | | | | | | 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
* | Fix 'disappearing layers' bug (see http://b/2371053)Nicolas Roard2010-01-141-3/+0
| | | | | | | | | | | | 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...
* | Merge "Update jni_runtime.cpp with the latest changes to appendClassName." ↵Steve Block2010-01-141-5/+10
|\ \ | | | | | | | | | into eclair-mr2
| * | Update jni_runtime.cpp with the latest changes to appendClassName.Steve Block2010-01-141-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Move general includes before bindings includes." into eclair-mr2Steve Block2010-01-141-88/+88
|\ \ \ | |/ /
| * | Move general includes before bindings includes.Steve Block2010-01-141-88/+88
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Call into MimeTypeMap to get the mime type for an extension.Patrick Scott2010-01-134-36/+67
| | | | | | | | | | | | | | | | | | 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
* | Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2Leon Scroggins2010-01-121-2/+2
|\ \
| * | Compare Node pointers rather than CachedNode pointers.Leon Scroggins2010-01-121-2/+2
| | | | | | | | | | | | Fixes http://b/issue?id=2369028
* | | Merge "adding event to notify the plugin when it is on/off screen." into ↵Derek Sollenberger2010-01-123-1/+23
|\ \ \ | | | | | | | | | | | | eclair-mr2
| * | | adding event to notify the plugin when it is on/off screen.Derek Sollenberger2010-01-123-1/+23
| |/ /
* | | Ensure that the current textfield is actually a textfield before treating it ↵Leon Scroggins2010-01-121-2/+2
|/ / | | | | | | | | | | like one. Fix for http://b/issue?id=2368868
* | consolidating to only use one surface per plugin. give plugin access to java ↵Derek Sollenberger2010-01-116-109/+109
| | | | | | | | | | | | context. There is a companion commit in frameworks/base.
* | Bring up the IME after receiving a response from webkit.Leon Scroggins2010-01-117-48/+13
|/ | | | | | Fix for http://b/issue?id=2361658 Requires a change to frameworks/base.
* Merge "Updates the use of weak references in the script-to-Java bridge for ↵Steve Block2010-01-085-56/+56
|\ | | | | | | V8." into eclair-mr2
| * Updates the use of weak references in the script-to-Java bridge for V8.Steve Block2010-01-085-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Updates V8 version of JavaInstance to use RefCounted, rather than ↵Steve Block2010-01-082-10/+2
|\ \ | |/ | | | | implementing custom ref and deref methods." into eclair-mr2
| * Updates V8 version of JavaInstance to use RefCounted, rather than ↵Steve Block2009-12-302-10/+2
| | | | | | | | | | | | implementing custom ref and deref methods. Change-Id: I9cc775224edcda65884461eaf0f4ff7efb5922be
* | In motionUp, update the CachedHistory's mMouseBounds.Leon Scroggins2010-01-071-1/+3
| | | | | | | | | | | | mMouseBounds is later used to determine the point of clicking. Fixes http://b/issue?id=2313991
* | remove unused jni interfacesCary Clark2010-01-071-8/+0
| | | | | | | | companion change is in frameworks/base
* | Request <label> info only when accessing a textfield.Leon Scroggins2010-01-076-39/+28
| | | | | | | | | | | | | | Previously, we were storing the label info each time we build the navigation cache. Requires a change to frameworks/base.
* | In findBestHitAt, set x and y to the intersection of slop and cursor.Leon Scroggins2010-01-063-30/+24
| | | | | | | | Fixes http://b/issue?id=2201866
* | Store label information to be used for hint text.Leon Scroggins2010-01-064-6/+49
| | | | | | | | | | | | Fix for http://b/issue?id=2331526 Requires a change to frameworks/base.
* | Revert to ENABLE_ORIENTATION_EVENTS=1Nicolas Roard2010-01-041-1/+1
| |
* | webkit layers supportNicolas Roard2010-01-0419-6/+2285
| |
* | Merge "If the DOM changes textfield focus, make the IME work properly." into ↵Leon Scroggins2010-01-043-25/+41
|\ \ | | | | | | | | | eclair-mr2
| * | If the DOM changes textfield focus, make the IME work properly.Leon Scroggins2010-01-043-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge "Cherry-picks a WebKit change to revert recent changes to String ↵Steve Block2010-01-045-94/+66
|\ \ \ | |/ / |/| | | | | addition for JSC." into eclair-mr2
| * | Cherry-picks a WebKit change to revert recent changes to String addition for ↵Steve Block2010-01-045-94/+66
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge change Iab49f046 into eclair-mr2Android (Google) Code Review2009-12-181-8/+8
|\ \ | |/ |/| | | | | * changes: Fix to ensure plugin is notified even when the screen width does not change.
| * Fix to ensure plugin is notified even when the screen width does not change.Derek Sollenberger2009-12-181-8/+8
| |
* | Merge change I21d39461 into eclair-mr2Android (Google) Code Review2009-12-181-40/+44
|\ \ | |/ |/| | | | | * changes: Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
| * Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.Steve Block2009-12-181-40/+44
| | | | | | | | | | | | Also fixes some style issues. Change-Id: I21d39461b488a5f490ea3557b24fe1674903c286
* | Merge change I49687314 into eclair-mr2Android (Google) Code Review2009-12-182-9/+14
|\ \ | | | | | | | | | | | | * changes: Fixes a Geolocation bug with cached positions.
| * | Fixes a Geolocation bug with cached positions.Steve Block2009-12-172-9/+14
| |/ | | | | | | | | | | | | | | | | | | 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
* | Adds notes to upstream feature guards added in V8DOMWrapper.cpp.Steve Block2009-12-171-5/+6
|/ | | | Change-Id: Id7659cfcab17f24e48958086b4206b1906562d74