summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
Commit message (Expand)AuthorAgeFilesLines
* Cherry-pick WebKit change 53497 to rename jni_utility and jni_utility_private...Steve Block2010-01-201-1/+1
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-1/+1
* resolved conflicts for merge of 870689c8Nicolas Roard2010-01-041-0/+4
* am dcfdcbd8: am edb4aa51: Merge "Cherry-picks a WebKit change to revert recen...Steve Block2010-01-045-94/+66
|\
| * Cherry-picks a WebKit change to revert recent changes to String addition for ...Steve Block2010-01-045-94/+66
* | Fixes MainThreadAndroid to use AndroidThreading, rather than calling methods ...Steve Block2009-12-212-10/+41
|/
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-3/+0
* Merge webkit.org at r51976 : Fix conflicts in Makefiles.Steve Block2009-12-171-3/+0
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-17148-3520/+7977
* Enable orientation events.Patrick Scott2009-12-091-0/+1
* Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.Steve Block2009-11-251-0/+7
* Merge change I46e116c9 into eclair-mr2Android (Google) Code Review2009-11-241-4/+4
|\
| * Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.Steve Block2009-11-231-4/+4
* | Removes Android-specific wrapper for std::sort in Profile class.Steve Block2009-11-231-20/+0
|/
* Merge change Ia4f91efd into eclair-mr2Android (Google) Code Review2009-11-232-24/+0
|\
| * Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/T...Steve Block2009-11-202-24/+0
* | Updates Threading.h to reflect final version of Android atomicIncrement/Decre...Steve Block2009-11-231-1/+1
|/
* Removes a superfluous Android include from TypeTraits.cpp.Steve Block2009-11-201-4/+0
* Cleans up Threading.cpp/h ready for upstreaming to webkit.org.Steve Block2009-11-202-7/+3
* Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.Steve Block2009-11-201-5/+0
* Cleans up Android-specific changes to Platform.h, ready for upstreaming to we...Steve Block2009-11-191-30/+22
* Factors out common code from JSC and V8 Makefiles, ready for upstreaming to w...Steve Block2009-11-171-34/+2
* Revert https://android-git.corp.google.com/g/#change,31178Grace Kloba2009-11-161-14/+0
* Fixes license headers for all Android-specific JavaScriptCore and WebCore fil...Steve Block2009-11-133-12/+45
* Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.Steve Block2009-11-122-0/+8
* Removes extra define of HAVE_PTHREAD_RW_LOCK.Steve Block2009-11-111-1/+0
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-4/+0
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-10134-2010/+4111
* am 5469794f: Avoid constructing the MutexLocker class to avoid two mystery cr...Grace Kloba2009-10-301-0/+14
|\
| * Avoid constructing the MutexLocker class to avoidGrace Kloba2009-10-271-0/+14
| * Apparently we can't use atomic_inc/dec version as itGrace Kloba2009-10-211-1/+0
| * Back in 02/08 when we added android_atomic_inc/dec, forGrace Kloba2009-10-201-0/+1
* | The new WebKit expects atomicIncrement to return intGrace Kloba2009-10-211-1/+1
* | Fix spurious build breaks.Patrick Scott2009-10-201-3/+1
* | Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.Steve Block2009-10-201-0/+2
* | Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-202-34/+12
* | Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-20272-4200/+12851
* | Remove ARMAssembler.cpp from WebKit build, as it is not required on Android.Steve Block2009-10-191-1/+0
|/
* 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
* Revert "Start fixing JSC compile errors for new webkit."Andrei Popescu2009-08-191-1/+3
* Start fixing JSC compile errors for new webkit.Ben Murdoch2009-08-191-3/+1
* Merge WebKit r47420Ben Murdoch2009-08-18125-1514/+3552
* Fix ReadWriteLock class problem. Will upstream this asapAndrei Popescu2009-08-143-4/+7
* Fix some build errors.Ben Murdoch2009-08-131-0/+4
* Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings.Ben Murdoch2009-08-121-9/+1
* Merge in WebKit r47029.Ben Murdoch2009-08-11242-42735/+61237
* Makefile and webkitmerge tool edits needed to merge with latest webkit.Ben Murdoch2009-08-111-2/+2
* merge from open-source masterJean-Baptiste Queru2009-08-061-1/+1
|\