summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebCoreFrameBridge.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Fix some WebKit includesSteve Block2010-02-041-29/+22
| | | | Change-Id: Ibcdef84d6e49c7e4a725ac1d22ae59a165418280
* Renames a variable in AddJavascriptInterface which shadows a parameter of ↵Steve Block2010-02-041-3/+3
| | | | | | the same name Change-Id: I9600c489090def7f4ec6e1e66f8db68ed6551c80
* Implement V8 counter supportAndrei Popescu2010-02-021-0/+2
|
* Add request header support for the Browser/WebView.Grace Kloba2010-01-271-2/+41
| | | | | | | | | | | | | | QSB can use this instead of POST to send the location data. After QSB makes the switch, we should also remove the POST_DATA intent which is hidden. Add loadUrl(String url, HashMap extraHeaders) to WebView so that the caller can send the extra http headers. Remove "inline:" as no one is using it and it is a hidden feature. Part 3 of 3-project checkin.
* Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix styleSteve Block2010-01-211-1/+1
| | | | Change-Id: Icf99c709929ef14551de61e55780b97767575f01
* Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix styleSteve Block2010-01-211-1/+1
| | | | | | | 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
* Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-201-2/+2
| | | | | | | | | | | 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
* resolved conflicts for merge of acf4a21d to masterSteve Block2010-01-191-9/+9
|\ | | | | | | Change-Id: If8bb4335848f51919608d28a30ee610acb120ae7
| * Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSCSteve Block2010-01-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | resolved conflicts for merge of df644d06 to masterSteve Block2010-01-191-1/+1
|\ \ | |/ | | | | Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
| * Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-191-1/+1
| | | | | | | | | | | | | | | | 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
* | Change LOGE to LOGV.Patrick Scott2010-01-191-1/+1
| |
* | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-181-1/+7
| | | | | | | | | | | | | | | | 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
* | am 43342a27: am ee0e4a35: Merge "Updates the use of weak references in the ↵Steve Block2010-01-081-11/+20
|\ \ | |/ | | | | | | | | | | | | | | script-to-Java bridge for V8." into eclair-mr2 Merge commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07' * commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07': Updates the use of weak references in the script-to-Java bridge for V8.
| * Updates the use of weak references in the script-to-Java bridge for V8.Steve Block2010-01-081-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | resolved conflicts for merge of a0fb8e99 to masterSteve Block2009-12-181-42/+47
|\ \ | |/ | | | | Change-Id: I58d6bb71dc7c4f5962c73669555a217c1d94b690
| * Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.Steve Block2009-12-181-40/+44
| | | | | | | | | | | | Also fixes some style issues. Change-Id: I21d39461b488a5f490ea3557b24fe1674903c286
* | am f0765cd6: am 02f7edff: Merge webkit.org at r51976 : ↵Steve Block2009-12-171-1/+6
|\ \ | |/ | | | | | | | | | | | | | | ScriptValue::getString now takes a ScriptState parameter. Merge commit 'f0765cd6cf9455ac0793d1a30287f4a57bc4871e' * commit 'f0765cd6cf9455ac0793d1a30287f4a57bc4871e': Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
| * Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState ↵Steve Block2009-12-171-1/+6
| | | | | | | | | | | | | | | | parameter. See http://trac.webkit.org/changeset/51801 Change-Id: I819c17c8609dd65799bd8a2245cc454e27271969
* | am ba6d5d3a: am 2c3e1d02: Merge webkit.org at r51976 : ↵Steve Block2009-12-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | externalRepresentation now takes a Frame argument. Merge commit 'ba6d5d3abff2997e37db0d6ec70d9f2e7717ac2f' * commit 'ba6d5d3abff2997e37db0d6ec70d9f2e7717ac2f': Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
| * Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.Steve Block2009-12-171-1/+1
| | | | | | | | | | | | See http://trac.webkit.org/changeset/50923 Change-Id: I8c7bb8af6e40fd449e27f28ff0d2e58fbb4d9eb3
* | resolved conflicts for merge of 33cbb138 to masterLeon Scroggins2009-12-161-2/+50
|\ \ | |/
| * Provide localized strings for <input> labels.Leon Scroggins2009-12-151-2/+50
| | | | | | | | | | | | | | | | | | 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.
* | am da8d42de: am 80e68b43: Break the WebCore -> WebKit dependency in ↵Andrei Popescu2009-12-111-3/+3
|\ \ | |/ | | | | | | | | | | | | | | ResourceHandleAndroid.cpp. Merge commit 'da8d42def98a28bfef84ce5809d13ae1710a342c' * commit 'da8d42def98a28bfef84ce5809d13ae1710a342c': Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.
| * Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.Andrei Popescu2009-12-111-3/+3
| |
* | am ae37cde5: am 4c603120: Merge change I85087ab0 into eclair-mr2Patrick Scott2009-12-101-1/+13
|\ \ | |/ | | | | | | | | | | Merge commit 'ae37cde5e54f2f2e051007f19f203f5efdcab34a' * commit 'ae37cde5e54f2f2e051007f19f203f5efdcab34a': Enable orientation events.
| * Enable orientation events.Patrick Scott2009-12-091-1/+13
| | | | | | | | | | | | | | Remove our old orientation hacks as webkit now supports the orientation event. Call down into webkit when the orientation changes to send the js event. The change to Frame.cpp has been submited to bugs.webkit.org as issue 32321.
* | resolved conflicts for merge of c8da3d7c to masterPatrick Scott2009-12-041-2/+5
|\ \ | |/
| * Pass up flags for the main resource and user gesture.Patrick Scott2009-12-041-2/+4
| | | | | | | | This requires a change to the framework.
* | am 2e36087f: am 4e95824e: Save form data for elements other than type "text".Leon Scroggins2009-12-021-20/+15
|\ \ | |/ | | | | | | | | | | Merge commit '2e36087fc1e77130a596ec30566928462570b162' * commit '2e36087fc1e77130a596ec30566928462570b162': Save form data for elements other than type "text".
| * Save form data for elements other than type "text".Leon Scroggins2009-12-021-20/+15
| | | | | | | | | | | | | | Partial fix for http://b/issue?id=2232001 When returning the form data for a page, check other types of textfields besides "text" input elements. Also consider "email", "number", etc.
* | am 1573e25e: am 8ec42170: Enable WebKit page cache through WebSettings.Grace Kloba2009-12-021-8/+8
|\ \ | |/ | | | | | | | | | | Merge commit '1573e25e3a50d588fb83b3e4be6fb8bf5dc7ec65' * commit '1573e25e3a50d588fb83b3e4be6fb8bf5dc7ec65': Enable WebKit page cache through WebSettings.
| * Enable WebKit page cache through WebSettings.Grace Kloba2009-12-021-8/+8
| | | | | | | | | | | | | | | | Add setXX() for the meta data in Settings. Add CachedFramePlatformDataAndroid to preserve the state for the cachedFrame. http://b/issue?id=2284168
* | resolved conflicts for merge of c3ebd21f to masterBen Murdoch2009-11-251-8/+8
|\ \ | |/ | | | | Change-Id: I7ca6ae7cb23e34765801782961bb052d6bb63fa4
| * Unfork WebCore/bridge/jni.Ben Murdoch2009-11-241-5/+5
| | | | | | | | Change-Id: I973e6b03286b1d8f6e6325a2b31d0cf9e99d19b3
* | am 7063c3ef: Merge change I67ad4b89 into eclair-mr2Steve Block2009-11-131-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '7063c3efe30d0ec965ac48439917030f62f50489' * commit '7063c3efe30d0ec965ac48439917030f62f50489': Fixes license headers for all files in WebKit/android, other than those in stl/.
| * Fixes license headers for all files in WebKit/android, other than those in stl/.Steve Block2009-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | These files have not yet been upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. This change adds licenses where absent or simply fixes the names of copyright holders in the license text to 'THE COPYRIGHT OWNER' and cleans up formatting. Files in stl/ currently use licenses other than BSD-style and will require more careful treatment. Change-Id: I67ad4b8932e432d3eaaeecdfeb0d09418496228d
* | am 20626c19: Merge webkit.org at r50258 : toJSDOMWindow now takes a ↵Steve Block2009-11-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | DOMWrapperWorld parameter. Merge commit '20626c197f988d4bae39e99e4699173602b0aaaa' * commit '20626c197f988d4bae39e99e4699173602b0aaaa': Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld parameter.
| * Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld ↵Steve Block2009-11-101-1/+1
| | | | | | | | | | | | | | | | parameter. See http://trac.webkit.org/changeset/49963 and http://trac.webkit.org/changeset/49978 Change-Id: Ic788827d54ccf48a3eb54863d2708ebad1d67ae1
* | am c05f32f6: Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now ↵Steve Block2009-11-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | takes a ReferrerPolicy parameter. Merge commit 'c05f32f6ac83a4d9467153745a217b636e8c8a60' * commit 'c05f32f6ac83a4d9467153745a217b636e8c8a60': Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ReferrerPolicy parameter.
| * Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ↵Steve Block2009-11-101-1/+1
| | | | | | | | | | | | | | | | ReferrerPolicy parameter. See http://trac.webkit.org/changeset/49809 Change-Id: I5db6d1d821cc6e7b57dfa665ea9018b4833864d5
* | am 5995cab4: Merge webkit.org at r50258 : FrameLoader::executeScript has ↵Steve Block2009-11-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | moved to ScriptController. Merge commit '5995cab44737fd5374956941260caf2e2e8290b3' * commit '5995cab44737fd5374956941260caf2e2e8290b3': Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
| * Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ↵Steve Block2009-11-101-1/+1
| | | | | | | | | | | | | | | | ScriptController. See http://trac.webkit.org/changeset/49372 Change-Id: Iecc49a2185681eb2f37b5ecc9364fa8946493f69
* | resolved conflicts for merge of ef7b176b to masterGrace Kloba2009-11-091-3/+8
|\ \ | |/
| * Add/expose postdata identifier so that when we cacheGrace Kloba2009-11-081-3/+9
| | | | | | | | | | | | | | | | | | | | the post data, we can distinguish them. add identifier to postUrl(). add identifier when we check whether the post data can be loaded from cache. Fix http://b/issue?id=1980031
* | am 8c6c2864: Merge change I998a5863 into eclair-mr2Steve Block2009-10-281-1/+6
|\ \ | |/ | | | | | | | | | | Merge commit '8c6c2864439f5757f8e480c9b23f640baacb9f4f' * commit '8c6c2864439f5757f8e480c9b23f640baacb9f4f': Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
| * Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.Steve Block2009-10-281-1/+6
| | | | | | | | | | | | | | | | The files in question are npapi.h and npruntime.h. The Android versions at V8Bindings/npapi/ are identical to the WebKit versions, other than a couple of trivial changes, which are accounted for in this patch. Change-Id: I998a5863181283aa6153c84a745b1923d9b5721b
* | am 0ddb5835: Merge change Ia17a9f02 into eclair-mr2Steve Block2009-10-281-7/+1
|\ \ | |/ | | | | | | | | | | Merge commit '0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1' * commit '0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1': Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
| * Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵Steve Block2009-10-271-7/+1
| | | | | | | | | | | | | | | | | | | | to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
* | Use native weak references instead of our wrapper.Patrick Scott2009-10-271-86/+44
|/ | | | | | | | | | | | | | Revert "Add check null of getRealObject(). When a WebView is" This reverts commit b47ea2b1184167767692f88c1e5f3e4e89db04b2. Revert "Update the comment for checking null in needtouchevents." This reverts commit 1e67e45d20ead40b0407618abbc5e20840dc3c80. Revert "Check null for WebViewCore's nativeClass before calling" This reverts commit 992afbebfb735ec2dd52b4166c22ab55827d88ed. Fix a few places where DeleteLocalRef and DeleteGlobalRef were used incorrectly. Fix a compilation warning as well.
generated by cgit v1.1 at 2025-11-29 23:44:25 +0000