summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r65615 : UTF8String() becomes utf8().Iain Merrick2010-08-235-7/+7
| | | | | | | | | This was changed for JSC strings in http://trac.webkit.org/changeset/65305, but the V8 implementation was not updated. Fix upstream in WebKit -- see https://bugs.webkit.org/show_bug.cgi?id=44419 Change-Id: Icaf70d9f8a3120613ab3e80b69d4ce0c7af89d46
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2321-81/+82
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-123-11/+7
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-043-4/+3
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-1/+1
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge Webkit at r63173 : Fix conflicts.Leon Clarke2010-07-201-3/+0
| | | | | | | | | | | | | | | | | | | | Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064 CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038 'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end' HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165 'HTML5 Parser: document.write after onload blows away document' Navigator.h conflict caused by http://trac.webkit.org/changeset/62577 Page.cpp caused by http://trac.webkit.org/changeset/62502 ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736 HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032 Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-202-0/+31
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Update JavaInstance to reflect final version upstreamed to WebKitSteve Block2010-07-072-9/+8
| | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=41516 Bug: 2807132 Change-Id: I080978d1a6b90f2d8da1f62adbb62c60ef0034c9
* Merge WebKit at r61871: Fix conflictsKristian Monsen2010-07-021-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | V8Proxy.cpp http://trac.webkit.org/changeset/61499 npapi.h: http://trac.webkit.org/changeset/61277 Document.cpp http://trac.webkit.org/changeset/61787 XMLDocumentParser.h: http://trac.webkit.org/changeset/61663 HTMLLinkElement.*: http://trac.webkit.org/changeset/61424 HTMLTableCellElement.cpp http://trac.webkit.org/changeset/61630 ResourceHandleAndroid.cpp: http://trac.webkit.org/changeset/61768 Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-022-113/+213
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* am 939d1819: am 9d4701f9: Push a local reference frame to avoid table overflow.Patrick Scott2010-07-012-8/+13
|\ | | | | | | | | | | | | Merge commit '939d1819c550af9e179aa2fa46668206333e1ebc' * commit '939d1819c550af9e179aa2fa46668206333e1ebc': Push a local reference frame to avoid table overflow.
| * Push a local reference frame to avoid table overflow.Patrick Scott2010-06-292-8/+13
| | | | | | | | | | | | | | | | | | Similar to jsc's implementation, this is needed to restrict the amount of local references in a given jni frame. Once the frame is popped from the stack, all local references are cleaned. Bug: 2807132 Change-Id: I5f4153509c513bec142472927a1787869a57f530
* | Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1617-75/+85
| | | | | | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* | Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0818-119/+112
| | | | | | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* | Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-2720-49/+51
| | | | | | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* | Merge WebKit at r59636: Fix Android ifdef, commas moved upstream.Kristian Monsen2010-05-251-2/+2
| | | | | | | | | | | | http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0 Change-Id: I03b28d93e229f5a0f7dbc918c0234a549bb73071
* | Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-256-638/+624
| | | | | | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* | Cherry-pick WebKit change 59918 to fix Java bridge for JSCSteve Block2010-05-211-1/+3
| | | | | | | | | | | | | | | | This is required to allow the LayoutTestController to work. See http://trac.webkit.org/changeset/59918 Change-Id: I96ab4a0da1ebb9e42cff43e4296341830d57f078
* | Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
* | Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1420-116/+300
| | | | | | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* | Merge webkit.org at r58033 : Cherry-pick WebKit change 58775 to include ↵Steve Block2010-05-113-1/+6
| | | | | | | | | | | | | | | | jni_jsobject.h for jlong_to_pt() and ptr_to_jlong() See http://trac.webkit.org/changeset/58775 Change-Id: Id1efa09e2f3578f8c782da0686c2df4d87fc83c3
* | Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-112-41/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* | Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1146-353/+869
| | | | | | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* | Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-276-102/+228
|/ | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Get the correct class name from the JVM when constructing arrays in the JNI ↵Ben Murdoch2010-04-011-10/+10
| | | | | | | | | | bindings. Also a change in packages/apps/Browser to update the unit tests for JNI bindings. Fix for b/2540502 Change-Id: Ia86a1ac672bd6653427ac0a969b4d40c86141415
* Merge "Implement the V8 JNI bindings more completely." into froyoBen Murdoch2010-03-313-7/+225
|\
| * Implement the V8 JNI bindings more completely.Ben Murdoch2010-03-313-7/+225
| | | | | | | | Change-Id: I3b3d2bff84ee4a1039424cf1881e5d3d428127f9
* | Fix build by removing PLATFORM macro from npapi.Andrei Popescu2010-03-301-1/+1
| | | | | | | | Change-Id: I57d350a8933a1a4825cebb7c81d4ae944375f258
* | Ask the plugin how long to wait before calling NPN_WriteReady() again.Andrei Popescu2010-03-301-2/+7
|/ | | | Change-Id: I46b25a5869e91e0075913caca5e57380f72f6107
* Cherry pick from master.Steve Block2010-03-295-15/+17
| | | | | | | | | | | | Cherry-picks WebKit change 56105 to eliminate use of bzero in WebKit common code Note that manual changes were required to JNIUtilityPrivate.cpp as this file has changed upstreamed, but the merge will be trivial. See http://trac.webkit.org/changeset/56105 Bug: 2535696 Change-Id: I464a4aa78b1625961724b6001caba1c315ed9f91
* Fixes the Mac buildSteve Block2010-03-171-6/+8
| | | | | | | | - JavaInstanceJSC.cpp - Adds ANDROID guards around some temporary logging - Geolocation.cpp - Adds ANDROID guards around changes waiting to be upstreamed - WebChromeClient.h / EmptyClients.h - Pulls the Mac part of a WebKit change for which only the Android part was cherry-picked in https://android-git.corp.google.com/g/#change,41747 Change-Id: Ide97cb6b05e78528fe4b9430466837dedaadc4cf
* Adds some logging to JObjectWrapperSteve Block2010-03-152-1/+18
| | | | | | | | This is an attempt to track down the cause of a crashing bug in the WebCore bridge, which is only occasionally triggered by the monkey. Bug: 2435360 Change-Id: I3171eb1978de285fcf258f908aa0a08d95b72968
* Adds some logging to JObjectWrapperSteve Block2010-03-091-1/+6
| | | | | | | | This is an attempt to track down the cause of a crashing bug in the WebCore JSC bridge, which is only occasionaly triggered by the monkey. Bug: 2435360 Change-Id: I35069c2aff3d9cdf2cfd49264715c418911c9d9c
* Don't leak global weak references when running layout testsLeon Clarke2010-03-042-2/+6
|
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-168-19/+27
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Fix merge conflictsSteve Block2010-02-151-12/+0
| | | | | | | | | | | | - Take both for Android makefiles, other than typo for JavaNPObjectV8 upstream - Take theirs for XCode project file and ChangeLog - Fix trivial header conflict in V8DocumentCustom - Keep ours for fix in JNIUtilityPrivate.cpp - Take theirs for V8DOMWrapper.cpp. Conflict is due to Android addition of TouchEvents, which conflicts with http://trac.webkit.org/changeset/54259 - Take both for Android addition of applicationInstalledCallback - Take both for Android JSC JIT changes in Platform.h Change-Id: Ib1a748f204a07a7e736feeee6a0f30f7453754a7
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-0/+12
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Cherry-pick recent WebKit changes to JavaClassJSC.cppSteve Block2010-02-111-30/+35
| | | | | | | These changes were made in http://trac.webkit.org/changeset/53865, so should have been picked up in the last WebKit merge to r54127, but were somehow missed. Change-Id: Id21807fe9bf6507a591b6b12e914aea41a62c3de
* Update fix in convertNPVariantToJValue to reflect final version submitted to ↵Steve Block2010-02-051-6/+0
| | | | | | webkit.org See http://trac.webkit.org/changeset/54366
* Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridgeSteve Block2010-02-045-53/+0
| | | | | | | | Keep ours for generic bridge code as this is a work in progress. Take theirs for conflicts on other platforms due to bridge changes. Take theirs for updates for recently moved JSC JNI bridge. Change-Id: I7db68450a369bb652755cc4b9555083c76b07510
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0421-55/+607
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Fix a bug when converting double and float types from NP variants to JNI ↵Steve Block2010-02-041-4/+10
| | | | | | | | | types on V8 This bug has been present since the code was first added in V8Bindings/jni/jni_utility.cpp. https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=7fa30a60f66c19c8e6fb91ef799bca4d8d6f57f2 Change-Id: I4cc74369880d42e6610c2959f2d8bef2b7712927
* Update V8 JNI bridge code to match final version submitted to webkit.orgSteve Block2010-02-0212-81/+72
| | | | | | | | | | | | | | No functional changes, style changes only See the following WebKit changes ... JavaStringV8 : http://trac.webkit.org/changeset/54132 JavaInstanceV8 : http://trac.webkit.org/changeset/54165 JavaClassV8 : http://trac.webkit.org/changeset/54169 JNIUtilityPrivate : http://trac.webkit.org/changeset/54171 JNIBridgeV8 : http://trac.webkit.org/changeset/54175 JavaNPObjectV8 : http://trac.webkit.org/changeset/54237 Change-Id: I7cc9d19e74043d1bac1a576cdc97a780fe317b5d
* V8 can now use WebCore/bridge/jni/JNIBridge.hSteve Block2010-01-277-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNIBridge.h is now used by both JSC and V8 $ diff WebCore/bridge/jni/JNIBridge.h V8Binding/jni/jni_runtime.h 2d1 < * Copyright (C) 2003, 2004, 2005, 2007, 2009, 2010 Apple Inc. All rights reserved. 27,30c26,27 < #ifndef JNIBridge_h < #define JNIBridge_h < < #if ENABLE(MAC_JAVA_BRIDGE) --- > #ifndef jni_runtime_h > #define jni_runtime_h 31a29 > #include "Bridge.h" 34,35c32,33 < #if USE(JSC) < #include "JavaStringJSC.h" --- > #if USE(V8) > #include "JavaStringV8.h" 64,66d61 < #if USE(JSC) < operator UString() const { return m_impl.uString(); } < #endif 118,120c113 < #endif // ENABLE(MAC_JAVA_BRIDGE) < < #endif // JNIBridge_h --- > #endif // jni_runtime_h Change-Id: I59c7dafb295aa7c81e79283333266c3f9f5a9a52
* Updates V8 versions of JavaMethod and JavaParameter to match JSC versionsSteve Block2010-01-262-0/+2
| | | | | | | | | V8 versions of JavaMethod and JavaParameter are provided by jni_runtime. This change updates those classes to match the JSC versions in JNIBridge. The changes are syntactic only and do not affect behavior. This will allow jni_runtime to be merged with JNIBridge. Change-Id: I2fceed94e1b57d133a068f51a2a40797447b7b58
* Moves V8's JavaField from V8's jni_runtime to JavaClassV8 and fixes styleSteve Block2010-01-263-1/+105
| | | | | | | | | | | | | | | | JavaField is script-engine specific. The JSC version of JavaField was moved out of the script-independent file JNIBridge (previosuly named jni_runtime) in http://trac.webkit.org/changeset/53849 This change makes the equivalent move for V8. This will make V8's version of jni_runtime script-independent, allowing it to be merged with JNIBridge in WebCore in the future. This change is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=34166 Change-Id: I7b35bfe4e8e7820623a824028eb64d06421bdb6b
* Cherry-pick WebKit change 53849 to move JavaField and JavaArray from ↵Steve Block2010-01-267-452/+542
| | | | | | | | | JNIBridge to JNIBridgeJSC See http://trac.webkit.org/changeset/53849 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: Ic73bf8213ae677b69e763a6b04f8c94f7f1eaed1
* Updates V8 version of JavaString to use a private implementation class.Steve Block2010-01-213-4/+67
| | | | | | | | | 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
* Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix styleSteve Block2010-01-213-1/+225
| | | | Change-Id: Icf99c709929ef14551de61e55780b97767575f01
* Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix styleSteve Block2010-01-212-0/+267
| | | | | | | 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
generated by cgit v1.1 at 2024-12-25 15:38:56 +0000