summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* Add code that enables SquirrelFish Extreme (a.k.a JSCX, JSC JIT) in Android.Huahui Wu2010-02-122-1/+18
| | | | | It's disabled by default, but is enabled when the enveronment variable ENABLE_ANDROID_JSC_JIT is set to true.
* Merge webkit.org at r54127 : Fix MakefilesSteve Block2010-02-041-0/+1
| | | | | | | Note that we update the XCode project file to add the new GeolocationPositionCache files to allow us to build Android WebKit on Mac. Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
* Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROIDSteve Block2010-02-041-6/+1
| | | | | | See http://trac.webkit.org/changeset/52791 Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
* Merge webkit.org at r54127 : Take theirs for changes to JavaScript string ↵Steve Block2010-02-044-58/+84
| | | | | | | | | | | addition. The conflict is due to the fact that we cherry-picked a WebKit change http://trac.webkit.org/changeset/51978 to fix a bug. This change updates all files touched by this change to match webkit.org. See https://android-git.corp.google.com/g/#change,36411 Change-Id: Ie17c59467b74f3bf3be1149bebe086b92b30afc4
* Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for ↵Steve Block2010-02-041-3/+0
| | | | | | other platforms. Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04269-4487/+11849
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-201-1/+1
| | | | | | | | | | | 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
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-1/+1
| | | | | | | | | | | | Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
* resolved conflicts for merge of 870689c8Nicolas Roard2010-01-041-0/+4
|
* am dcfdcbd8: am edb4aa51: Merge "Cherry-picks a WebKit change to revert ↵Steve Block2010-01-045-94/+66
|\ | | | | | | | | | | | | | | | | recent changes to String addition for JSC." into eclair-mr2 Merge commit 'dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60' * commit 'dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60': Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
| * 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
* | Fixes MainThreadAndroid to use AndroidThreading, rather than calling methods ↵Steve Block2009-12-212-10/+41
|/ | | | | | | | | | | | on JavaSharedClient directly. AndroidThreading is defined in WTF and implemented in WebKit. This is the pattern used by Chromium, and avoids the current layering violation due to WTF calling into WebKit. This is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32651 Change-Id: Ic58f0270ed134d9f897075cca692718d1c2e9369
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-3/+0
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Fix conflicts in Makefiles.Steve Block2009-12-171-3/+0
| | | | | | | Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858 and http://trac.webkit.org/changeset/51926 Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-17148-3520/+7977
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Enable orientation events.Patrick Scott2009-12-091-0/+1
| | | | | | | 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.
* Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.Steve Block2009-11-251-0/+7
| | | | | | | | This default was recently removed but is required to build on Mac. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=2cc706295f906df0bb49f51c9efe92a97c427464#patch1 Change-Id: Ice535a8205d14a0f3c3bfc4f32bc7d71132fbc2a
* Merge change I46e116c9 into eclair-mr2Android (Google) Code Review2009-11-241-4/+4
|\ | | | | | | | | * changes: Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
| * Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.Steve Block2009-11-231-4/+4
| | | | | | | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=31807 Change-Id: I46e116c933475699cba499e3c27921e00ebab666
* | Removes Android-specific wrapper for std::sort in Profile class.Steve Block2009-11-231-20/+0
|/ | | | | | | | | It appears that previosuly, a wrapper function was required to perform the required type casting when passing a custom comparison function to Android's std::sort. This is no longer required, so the wrapper can be removed. Change-Id: I30add3d6b41eca2558867755a34dda21a180166f
* Merge change Ia4f91efd into eclair-mr2Android (Google) Code Review2009-11-232-24/+0
|\ | | | | | | | | * changes: Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
| * Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to ↵Steve Block2009-11-202-24/+0
| | | | | | | | | | | | | | | | | | | | | | WebKit/android/Timecounter. This function is an Android addition to JavaScriptCore::WTF, but is not used anywhere in WebCore or JavaScriptCore. Futhermore, JavaScriptCore/wtf/CurrentTime does not contain any other platform additions. It's used primarily in WebKit/android/TimeCounter, so I've moved it there. I've also updated the name to getThreadMsec to match WebKit style. Change-Id: Ia4f91efd3caaafd1fb079afe6c493aefea402582
* | Updates Threading.h to reflect final version of Android ↵Steve Block2009-11-231-1/+1
|/ | | | | | | | atomicIncrement/Decrement submitted to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=31715 Change-Id: I7f9c0552bd9f3c51e7b869bd1c782ef72d28f1a4
* Removes a superfluous Android include from TypeTraits.cpp.Steve Block2009-11-201-4/+0
| | | | Change-Id: I344d69490b8050ff659e2b380c05fb9872d66cde
* Cleans up Threading.cpp/h ready for upstreaming to webkit.org.Steve Block2009-11-202-7/+3
| | | | | | | | | | | | | | | | $ diff ~/WebKitTipOfTree/JavaScriptCore/wtf/Threading.cpp JavaScriptCore/wtf/Threading.cpp $ diff ~/WebKitTipOfTree/JavaScriptCore/wtf/Threading.h JavaScriptCore/wtf/Threading.h 75a76,77 > #elif PLATFORM(ANDROID) > #include "cutils/atomic.h" 234a237,241 > #elif PLATFORM(ANDROID) > > inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } > inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } > Change-Id: Ie4835ff88aae608b7a1844be1b422d105b327528
* Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.Steve Block2009-11-201-5/+0
| | | | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=31671 Note that we only need to undef a feature enable flag when we are overwriting a default value previosuly set in Platform.h. Also, we now rely on the default value for ENABLE_DATABASE. Change-Id: I26ca5ef5402609ead880bdd1ce05cdb3646c1bbc
* Cleans up Android-specific changes to Platform.h, ready for upstreaming to ↵Steve Block2009-11-191-30/+22
| | | | | | webkit.org. Change-Id: I873491c433058c5f3bc9d00f40e80813f831f736
* Factors out common code from JSC and V8 Makefiles, ready for upstreaming to ↵Steve Block2009-11-171-34/+2
| | | | | | | | | | | | | | | | | | | | | webkit.org. Both the JSC and V8 builds use Android.mk, WebCore/Android.mk and WebCore/Android.derived.mk. The JSC build also uses WebCore/Android.jscbindings.mk and WebCore/Android.derived.jscbindings.mk. The V8 build also uses V8Bindings/V8Binding.derived.mk. Change details ... Android.mk - Added content from both Android.jsc.mk and Android.v8.mk and removed these files. Added ifdefs to switch between two builds. WebCore/Android.mk - Moved JSC bindings code to WebCore/Android.jscbindings.mk. This file is now functionally identical to WebCore/Android.v8.mk, which was removed. WebCore/Android.derived.mk - Moved JSC bindings code to WebCore/Android.derived.jscbindings.mk. This file is now functionally identical to WebCore/Android.v8.derived.mk, which was removed. Also updates copyright dates, as per WebKit requirements. Change-Id: I92377b60f6f63c57283c316a2c7c2c64a13dc7de
* Revert https://android-git.corp.google.com/g/#change,31178Grace Kloba2009-11-161-14/+0
| | | as http://b/issue?id=2183371 is finally fixed.
* Fixes license headers for all Android-specific JavaScriptCore and WebCore ↵Steve Block2009-11-133-12/+45
| | | | | | | | | | | | | | | | | | | | | | files not yet 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. - For most files, I've fixed the names of copyright holders in the license text to 'THE COPYRIGHT HOLDERS' and cleaned up formatting in the existing BSD-style license. - For Makefiles and the following files in WebCore/platform/graphics/android/, I've changed from an Apache 2.0 license to the BSD-style license. - WebCore/platform/graphics/android/BitmapAllocatorAndroid.cpp - WebCore/platform/graphics/android/BitmapAllocatorAndroid.h - WebCore/platform/graphics/android/SharedBufferStream.cpp - WebCore/platform/graphics/android/SharedBufferStream.h - For the following files, I've changed from an LGPL licese to the BSD-style license. - WebCore/platform/graphics/android/FontPlatformData.h - WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp - WebCore/plugins/android/PluginDataAndroid.cpp Change-Id: Ic4c3e5610afc58637b7a9b81b1d0d1f17f4f4cb1
* Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.Steve Block2009-11-122-0/+8
| | | | | | | | | | | | | | | | Content from WebCorePrefixAndroid.h has been moved to WebCorePrefix.h and the Android Makefiles modified to use that file. - Enabler flags have been moved to WebCore/config.h. - flex_XXX_T types are defined in WebCore/css/maketokenizer - Most system includes are alreay present in WebCorePrefix.h - Some includes have been moved directly to the source files that require them. - The following includes seem not to be required so have been dropped. - #include <limits.h> - #include <math.h> - #include <stdint.h> - #include <unistd.h> Change-Id: I8eba4d0a606463503554955e113d57bdf76a7136
* Removes extra define of HAVE_PTHREAD_RW_LOCK.Steve Block2009-11-111-1/+0
| | | | | | | | | This define was added to Android and later upstreamed to webkit.org at a slightly different location. The latest WebKit merge caused both defines to be used. See https://bugs.webkit.org/show_bug.cgi?id=30713 Change-Id: Ib68ceddb57868903661a1d2e3fedf9e092222091
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-4/+0
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-10134-2010/+4111
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* am 5469794f: Avoid constructing the MutexLocker class to avoid two mystery ↵Grace Kloba2009-10-301-0/+14
|\ | | | | | | | | | | | | | | | | crashes. Merge commit '5469794fd9ad86cd03ba4cf7ef0bc82329362f39' into eclair-mr2 * commit '5469794fd9ad86cd03ba4cf7ef0bc82329362f39': Avoid constructing the MutexLocker class to avoid
| * Avoid constructing the MutexLocker class to avoidGrace Kloba2009-10-271-0/+14
| | | | | | two mystery crashes.
| * Apparently we can't use atomic_inc/dec version as itGrace Kloba2009-10-211-1/+0
| | | | | | | | | | causes more crashes. Revert it. Revert https://android-git.corp.google.com/g/30606
| * Back in 02/08 when we added android_atomic_inc/dec, forGrace Kloba2009-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | some reason, it missed define WTF_USE_LOCKFREE_THREADSAFESHARED. So we are using mutexlocker instead of refcount inc/dec. Even mutex version should work, but it is not exercised by win/darwin/gcc. Changing to use refcount version fixed the crash seen in picasaweb. Fix http://b/issue?id=2183371 Maybe fix http://b/issue?id=2165237. But I can't verify as I can't reproduce it even before my change.
* | The new WebKit expects atomicIncrement to return intGrace Kloba2009-10-211-1/+1
| | | | | | instead of void.
* | Fix spurious build breaks.Patrick Scott2009-10-201-3/+1
| | | | | | | | Split libwebcore.a into libwebcore.a and libjs.a and then link them together.
* | Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.Steve Block2009-10-201-0/+2
| | | | | | | | | | | | | | We disable INSPECTOR - See http://trac.webkit.org/changeset/48430 We disable EVENT_SOURCE - see http://trac.webkit.org/changeset/47323 Change-Id: Iab25b3bb56582d9df1e693ed7158338e953677b7
* | Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-202-34/+12
| | | | | | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* | Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-20272-4200/+12851
| | | | | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* | Remove ARMAssembler.cpp from WebKit build, as it is not required on Android.Steve Block2009-10-191-1/+0
|/ | | | Change-Id: Ic5a299518e5ca51b6833e4c236b97c7ea7dbe4a7
* Switch back to JSCAndrei Popescu2009-09-081-1/+0
|
* fix JSC support.Andrei Popescu2009-08-191-3/+1
|
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-19125-3552/+1514
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Revert "Start fixing JSC compile errors for new webkit."Andrei Popescu2009-08-191-1/+3
| | | | This reverts commit 62983d46fda85f4d912c221e5cbc91a05d4edebf.
* Start fixing JSC compile errors for new webkit.Ben Murdoch2009-08-191-3/+1
|
* Merge WebKit r47420Ben Murdoch2009-08-18125-1514/+3552
|
generated by cgit v1.1 at 2025-05-18 09:23:13 +0000