summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Removing reference to a java object that is no longer used.Derek Sollenberger2010-01-213-66/+2
| | | | | | | 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.
* Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4edSteve Block2010-01-2116-118/+746
|\ | | | | | | | | | | | | | | | | * 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
| * 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-214-1/+226
| | | | | | | | Change-Id: Icf99c709929ef14551de61e55780b97767575f01
| * Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix styleSteve Block2010-01-213-1/+269
| | | | | | | | | | | | | | 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 53620 to move bridge interfaces Field, Class, ↵Steve Block2010-01-218-113/+185
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Refactor style of Android specific touch events code in preparation ↵Ben Murdoch2010-01-214-5/+15
|\ \ | | | | | | | | | for upstreaming to webkit.org."
| * | Refactor style of Android specific touch events code in preparation for ↵Ben Murdoch2010-01-214-5/+15
| | | | | | | | | | | | | | | | | | upstreaming to webkit.org. Change-Id: Id34e727145fe94e98e62a36b7fc8256468b4157c
* | | Merge "Cherry-pick WebKit change 53619 to fix style in JNIBridge"Steve Block2010-01-213-292/+321
|\ \ \ | | |/ | |/|
| * | Cherry-pick WebKit change 53619 to fix style in JNIBridgeSteve Block2010-01-213-292/+321
| | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge"Steve Block2010-01-2111-19/+40
|\ \ \ | |/ / | | / | |/ |/|
| * Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridgeSteve Block2010-01-2111-19/+40
| | | | | | | | | | | | | | 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
* | resolved conflicts for merge of 9dabd572 to masterGrace Kloba2010-01-203-23/+35
|\ \ | |/ |/|
| * Changing plugin setwindow() to use page coordinateGrace Kloba2010-01-203-33/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Rename V8 jni_utility_private to JNIUtilityPrivate and fixes styleSteve Block2010-01-203-33/+31
| | | | | | | | | | | | | | 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
* | Fixes a bug in V8 version of jni_utility_private.cppSteve Block2010-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | 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
* | Move V8 jni_class to bridge/jni/v8/JavaClassV8 and fix styleSteve Block2010-01-203-0/+177
| | | | | | | | | | | | | | 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
* | Cherry-pick WebKit change 53533 to fix style in WebCore/bridge/JNIUtilitySteve Block2010-01-203-196/+195
| | | | | | | | | | | | | | 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
* | Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-2021-54/+85
| | | | | | | | | | | | | | | | | | | | | | 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
* | am d9b562d6: am 032a9065: Merge "Cherry-pick WebKit change 53541 to fix ↵Steve Block2010-01-208-42/+73
|\ \ | |/ | | | | | | | | | | | | | | 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
| * Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/BridgeSteve Block2010-01-208-42/+73
| | | | | | | | | | | | | | 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
* | am 0cfc2e19: am 315ee382: Merge "Cherry-pick WebKit change 53489 to fix ↵Steve Block2010-01-203-47/+60
|\ \ | |/ | | | | | | | | | | | | | | style in JavaClassJSC." into eclair-mr2 Merge commit '0cfc2e19eeb90d6897b190b056e192bc1afd5c44' * commit '0cfc2e19eeb90d6897b190b056e192bc1afd5c44': Cherry-pick WebKit change 53489 to fix style in JavaClassJSC.
| * 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
* | resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-2045-145/+296
|\ \ | |/ | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
| * 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-1942-104/+155
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-2032-440/+696
| | | | | | | | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* | am f83060e8: am be164dbc: Cherry-pick WebKit change 53443 to move jni_class ↵Steve Block2010-01-197-15/+33
|\ \ | |/ | | | | | | | | | | | | | | to JavaClassJSC Merge commit 'f83060e89e8ba30d0321f33164a0c4819f837a03' * commit 'f83060e89e8ba30d0321f33164a0c4819f837a03': Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
| * 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
* | resolved conflicts for merge of acf4a21d to masterSteve Block2010-01-195-160/+182
|\ \ | |/ | | | | Change-Id: If8bb4335848f51919608d28a30ee610acb120ae7
| * Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSCSteve Block2010-01-195-160/+182
| | | | | | | | | | | | | | | | | | | | | | | | 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-198-17/+37
|\ \ | |/ | | | | Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
| * Merge "Cherry-pick WebKit change 53412 to move jni_instance to ↵Steve Block2010-01-198-17/+37
| |\ | | | | | | | | | JavaInstanceJSC" into eclair-mr2
| | * Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-198-17/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 1a318d00: am 336f436c: Don\'t call setNPWindowRect unless the plugin has ↵Grace Kloba2010-01-191-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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
| * | 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.
* | | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-1819-31/+690
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add navigator.networkType to allow apps to detect the connection type.Andrei Popescu2010-01-1514-0/+188
| | | | | | | | | | | | | | | | | | The online event is fired when the networkType changes. Bug: 2368650
* | | Merge "Removes a superfluous call to GeoNotifier::m_timer::stop() when ↵Steve Block2010-01-151-1/+0
|\ \ \ | | | | | | | | | | | | Geolocation calls back with a position fix."
| * | | Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation ↵Steve Block2010-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fix for setting layers opacity through CSS (bug http://b/2376455)Nicolas Roard2010-01-151-0/+1
| | | |
* | | | Merge "Check for the absence of a frame. This crashes in the situation where ↵Leon Clarke2010-01-151-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028"
| * | | | Check for the absence of a frame.Leon Clarke2010-01-141-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028
* | | | am 93f808ab: am 388e461f: Add proper support for fixed position elementsNicolas Roard2010-01-143-23/+61
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '93f808abccaf6f09c5c0226c01942c3be445031a' * commit '93f808abccaf6f09c5c0226c01942c3be445031a': Add proper support for fixed position elements
| * | | Add proper support for fixed position elementsNicolas Roard2010-01-143-23/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 459f6c34: am 29b325cb: Fix \'disappearing layers\' bug (see http://b/2371053)Nicolas Roard2010-01-141-3/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | Merge commit '459f6c347256a4d9fe815793302130fe06bd8f83' * commit '459f6c347256a4d9fe815793302130fe06bd8f83': Fix 'disappearing layers' bug (see http://b/2371053)
| * | 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...
* | | am 594a3479: am 44364d80: Merge "Update jni_runtime.cpp with the latest ↵Steve Block2010-01-141-5/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | changes to appendClassName." into eclair-mr2 Merge commit '594a347941318556ae40d521e6f5c23fd9cf66b4' * commit '594a347941318556ae40d521e6f5c23fd9cf66b4': Update jni_runtime.cpp with the latest changes to appendClassName.
| * | 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