summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-042849-128355/+242855
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge "Renames a variable in AddJavascriptInterface which shadows a ↵Steve Block2010-02-041-3/+3
|\ | | | | | | parameter of the same name"
| * Renames a variable in AddJavascriptInterface which shadows a parameter of ↵Steve Block2010-02-041-3/+3
| | | | | | | | | | | | the same name Change-Id: I9600c489090def7f4ec6e1e66f8db68ed6551c80
* | Merge "Fix a bug when converting double and float types from NP variants to ↵Steve Block2010-02-041-4/+10
|\ \ | |/ | | | | JNI types on V8"
| * 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
* | Forward the console message level from WebCore to Java land.Ben Murdoch2010-02-043-6/+6
|/ | | | | | | | This change requires a change to frameworks/base to receive the extra information. BUG=2401755 Change-Id: I27b1059dbc24ad2687e8ef0223599b0efcd74eca
* Enable database and appcache for V8Steve Block2010-02-031-3/+9
| | | | | | | These have been disabled due to the new runtime feature enabler flags in the V8 bindings. See http://trac.webkit.org/changeset/49989 and http://trac.webkit.org/changeset/50534 Change-Id: I7fb78dcaa3235cd87af1aebed4d767e81dfc48e2
* Pass touch event time from Java to WebKitGrace Kloba2010-02-0310-12/+45
| | | merge from https://android-git.corp.google.com/g/#change,39356
* Merge "Guard the new Navigator connection property with a temporary ↵Steve Block2010-02-033-2/+4
|\ | | | | | | ENABLE_CONNECTION guard until it is upstreamed."
| * Guard the new Navigator connection property with a temporary ↵Steve Block2010-02-033-2/+4
| | | | | | | | | | | | | | | | | | ENABLE_CONNECTION guard until it is upstreamed. This is required to build Android WebKit for Mac. The guard will be removed once the connection property is upstreamed. Change-Id: I874e832b80dc682a49cae4df1fc6970283909ef3
* | Merge changes I83856763,Ib434e467Steve Block2010-02-031-18/+38
|\ \ | |/ | | | | | | | | * changes: Adds new GeolocationPositionCache files to XCode project Fix XCode project to allow us to build Android WebKit on Mac
| * Adds new GeolocationPositionCache files to XCode projectSteve Block2010-02-031-0/+8
| | | | | | | | | | | | | | | | This is required to build Android WebKit on Mac. See https://android-git.corp.google.com/g/#change,38319 Change-Id: I838567637b55aeed4d7b77e382ec6c8cffdb9e47
| * Fix XCode project to allow us to build Android WebKit on MacSteve Block2010-02-031-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent cherry-picks of WebKit patches were merged incorrectly into the XCode project file. This change fixes those bad merges. The relevant changes are ... JavaInstance - http://trac.webkit.org/changeset/53412 - https://android-git.corp.google.com/g/#change,37667 JavaClass - http://trac.webkit.org/changeset/53443 - https://android-git.corp.google.com/g/#change,37669 JavaStringJSC - http://trac.webkit.org/changeset/53449 - https://android-git.corp.google.com/g/#change,37687 Bridge - http://trac.webkit.org/changeset/53464 - https://android-git.corp.google.com/g/#change,37680 JNIUtility - http://trac.webkit.org/changeset/53497 - https://android-git.corp.google.com/g/#change,37815 JNIBridge - http://trac.webkit.org/changeset/53557 - https://android-git.corp.google.com/g/#change,37961 JNIBridgeJSC - http://trac.webkit.org/changeset/53849 - https://android-git.corp.google.com/g/#change,38446 BridgeJSC - http://trac.webkit.org/changeset/53620 - https://android-git.corp.google.com/g/#change,37963 Change-Id: Ib434e467c8569781a8acbf1c9e7714946d6e4887
* | resolved conflicts for merge of a82364c2 to masterBen Murdoch2010-02-030-0/+0
|\ \ | |/ |/| | | | | | | | | | | This is in conjunction with the frameworks/base rollback: Id1404fb056b033ebd60529dd326ec9a3c32f94b0 The intent of these two changes is to avoid auto merging from MR2. Change-Id: Idb5ba06a813fc547ebb45c6d251971a51cff3f0d
| * am 5b9b4d4e: Pass touch event time from Java to WebKitGrace Kloba2010-02-029-8/+26
| |\ | | | | | | | | | | | | | | | | | | Merge commit '5b9b4d4efe739cfa2aa117372879c5c37443e644' into eclair-mr2-plus-aosp * commit '5b9b4d4efe739cfa2aa117372879c5c37443e644': Pass touch event time from Java to WebKit
| | * Pass touch event time from Java to WebKitGrace Kloba2010-02-029-8/+26
| | |
* | | Merge "Update V8 JNI bridge code to match final version submitted to webkit.org"Steve Block2010-02-0213-83/+74
|\ \ \
| * | | Update V8 JNI bridge code to match final version submitted to webkit.orgSteve Block2010-02-0213-83/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Cherry pick of WebKit revision r54138 ↵Ben Murdoch2010-02-021-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | (http://trac.webkit.org/changeset/54138) to add source and line number information to ScriptCallFrames when the caller is unknown."
| * | | | Cherry pick of WebKit revision r54138 ↵Ben Murdoch2010-02-021-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | (http://trac.webkit.org/changeset/54138) to add source and line number information to ScriptCallFrames when the caller is unknown. BUG=2376873 Change-Id: I91346705b9c24cf7862070685bf3830d2a18f12e
* | | | Implement V8 counter supportAndrei Popescu2010-02-025-0/+206
|/ / /
* | | Add ANDROID tags to some touchevents changes that have yet to be upstreamedSteve Block2010-02-011-1/+8
| | | | | | | | | | | | Change-Id: Ie67cdb2c404c59589f282b2b4494507d5c606f11
* | | Update Android to reflect final version submitted to webkit.org when ↵Steve Block2010-02-011-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | changing touchevents behavior See http://trac.webkit.org/changeset/52922 Change-Id: I2057acd590a540744a4d7db6fe9b29b887339906
* | | Update Android to reflect final version submitted to webkit.org when adding ↵Steve Block2010-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | touchcancel support See http://trac.webkit.org/changeset/53548 Change-Id: Ie64613b373a88a5333e83e4a9c9cb1e8d72092fb
* | | Update to Android to reflect final version submitted to webkit.org when ↵Steve Block2010-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | adding ChromeClient::needTouchEvents See http://trac.webkit.org/changeset/54069 Change-Id: Ie42af496d701863682c52e03613248815b7d7b4f
* | | Cherry-pick WebKit change 54096 for client-based GeolocationSteve Block2010-02-012-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/54096 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Ic4f06aa2cf4ef8655bd05cd30746d9548f7e0d33
* | | Cherry-pick WebKit change 54080 for client-based GeolocationSteve Block2010-02-012-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/54080 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Id67cac441eeaa58268c0bfdc8306a047bc56fba9
* | | Cherry-pick WebKit change 54079 for client-based GeolocationSteve Block2010-02-013-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/54079 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I46b8f439668768fa930c610d4b10c7e45cc1ca01
* | | Cherry-pick WebKit change 53708 for client-based GeolocationSteve Block2010-02-012-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53708 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I369d96f8af0fc060ca0c8a9c5a16c5cdf91bedd3
* | | Merge "Anchor the page at top left corner when webView size changed."Shimeng (Simon) Wang2010-01-291-35/+17
|\ \ \
| * | | Anchor the page at top left corner when webView size changed.Shimeng (Simon) Wang2010-01-291-35/+17
| | | | | | | | | | | | | | | | | | | | Bug: 2356891 modified: WebKit/android/jni/WebViewCore.cpp
* | | | Merge "Cherry pick the diff after going through review on webkit.org bug for ↵Ben Murdoch2010-01-291-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | 34215 (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard."
| * | | | Cherry pick the diff after going through review on webkit.org bug for 34215 ↵Ben Murdoch2010-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard. Change-Id: If3fa0398e756508a718d5d3d93a5dd322a5e3f01
* | | | | Merge "Fix Geolocation to make use of the startUpdating helper method"Steve Block2010-01-291-1/+1
|\ \ \ \ \
| * | | | | Fix Geolocation to make use of the startUpdating helper methodSteve Block2010-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should have been done as part of the cherry-pick of WebKit change 52103 in https://android-git.corp.google.com/g/#change,37374 This is a syntactic change only, no functional change on Android. Change-Id: Ic49ac710cafbacd5ff90e92d84b3360a316a43dd
* | | | | | Merge "Changes to make Bridge.h script-engine independent are complete"Steve Block2010-01-281-5/+0
|\ \ \ \ \ \
| * | | | | | Changes to make Bridge.h script-engine independent are completeSteve Block2010-01-271-5/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=32154 Change-Id: I76355f3e002af505560a8a8cfce1c98322f66230
* | | | | | 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.
* | | | | Merge "No text wrapping in FitToScreen mode when text has background image."Shimeng (Simon) Wang2010-01-271-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | No text wrapping in FitToScreen mode when text has background image.Shimeng (Simon) Wang2010-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2225518 modified: WebCore/rendering/RenderBlockLineLayout.cpp
* | | | | V8 can now use WebCore/bridge/jni/JNIBridge.cppSteve Block2010-01-273-158/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNIBridge.cpp is now used by both JSC and V8 This removes the last file from V8Bindings $ diff WebCore/bridge/jni/JNIBridge.cpp V8Binding/jni/jni_runtime.cpp 2d1 < * Copyright (C) 2003, 2004, 2005, 2007, 2009 Apple Inc. All rights reserved. 28c27 < #include "JNIBridge.h" --- > #include "jni_runtime.h" 30,32c29 < #if ENABLE(MAC_JAVA_BRIDGE) < < #include "CString.h" --- > #include "JNIUtility.h" 35,45d31 < < #ifdef NDEBUG < #define JS_LOG(formatAndArgs...) ((void)0) < #else < #define JS_LOG(formatAndArgs...) { \ < fprintf(stderr, "%s:%d -- %s: ", __FILE__, __LINE__, __FUNCTION__); \ < fprintf(stderr, formatAndArgs); \ < } < #endif < < using namespace JSC; 49d34 < 106,109d90 < #if USE(JSC) < ASSERT(JSLock::lockCount() > 0); < #endif < 127,130d107 < #if USE(JSC) < JSLock lock(SilenceAssertionsOnly); < #endif < 177,178d153 < < #endif // ENABLE(MAC_JAVA_BRIDGE) Change-Id: I3f0aabc5af56083aa950eca1609b2fe9b46726c9
* | | | | V8 can now use WebCore/bridge/jni/JNIBridge.hSteve Block2010-01-2711-128/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge changes I0ab68eac,Ide43a042,I0c11519b,I1ef80088Steve Block2010-01-275-6/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update Android to reflect final version submitted to webkit.org for ScriptController Update Android to reflect final version submitted to webkit.org for touch events. Update Android to reflect final version submitted to webkit.org for V8 TODOs Update Android to reflect final version submitted to webkit.org for adding NetworkStateNotifier::networkStateChange
| * | | | | Update Android to reflect final version submitted to webkit.org for ↵Steve Block2010-01-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptController See https://android-git.corp.google.com/g/#change,37366 and http://trac.webkit.org/changeset/53673 Change-Id: I0ab68eac66a29b14ad3c169611843ae83bab8a45
| * | | | | Update Android to reflect final version submitted to webkit.org for touch ↵Steve Block2010-01-272-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events. See https://android-git.corp.google.com/g/#change,37040 http://trac.webkit.org/changeset/51981 and http://trac.webkit.org/changeset/53548 Change-Id: Ide43a0425cff940bfd07022d8e9bb72e3d12ce96
| * | | | | Update Android to reflect final version submitted to webkit.org for V8 TODOsSteve Block2010-01-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#change,38144 and http://trac.webkit.org/changeset/53630 Change-Id: I0c11519bada84ed20af462e3a72c0fa931a7786e
| * | | | | Update Android to reflect final version submitted to webkit.org for adding ↵Steve Block2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkStateNotifier::networkStateChange See http://trac.webkit.org/changeset/52635 Change-Id: I1ef80088f3d72f088140a478dd65d9fe5a287432
* | | | | | Merge "Fixes Geolocation maximumAge implementation to work when ↵Steve Block2010-01-272-36/+66
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | requestPermission is synchronous"
| * | | | | Fixes Geolocation maximumAge implementation to work when requestPermission ↵Steve Block2010-01-262-36/+66
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is synchronous Geolocation::requestPermission may be implemented synchronously or asynchronously. See https://bugs.webkit.org/show_bug.cgi?id=26993 The current implementation of maximumAge on Android requires that requestPermission is asynchronous. This change fixes the code to work with both synchronous and asynchronous implementations of requestPermission. This will allow the maximumAge code to be upstreamed to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=30676 Change-Id: If7115e5d34ec308c91a1873a6841731dc37c18bd
* | | | | Merge "Updates V8 versions of JavaMethod and JavaParameter to match JSC ↵Steve Block2010-01-274-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | versions"
generated by cgit v1.1 at 2025-01-12 05:36:39 +0000