Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge WebKit at r64523 : Initial merge by git. | Steve Block | 2010-08-09 | 1 | -0/+2 |
| | | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4 | ||||
* | Merge Webkit at r58956: Initial merge by Git. | Ben Murdoch | 2010-05-14 | 1 | -245/+11 |
| | | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228 | ||||
* | Merge webkit.org at r58033 : Initial merge by git | Steve Block | 2010-05-11 | 1 | -3/+3 |
| | | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 | ||||
* | Merge webkit.org at r54127 : Initial merge by git | Steve Block | 2010-02-04 | 1 | -11/+11 |
| | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 | ||||
* | Merge webkit.org at r51976 : Initial merge by git. | Steve Block | 2009-12-17 | 1 | -1/+1 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Updates Threading.h to reflect final version of Android ↵ | Steve Block | 2009-11-23 | 1 | -1/+1 |
| | | | | | | | | atomicIncrement/Decrement submitted to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=31715 Change-Id: I7f9c0552bd9f3c51e7b869bd1c782ef72d28f1a4 | ||||
* | Cleans up Threading.cpp/h ready for upstreaming to webkit.org. | Steve Block | 2009-11-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | $ 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 | ||||
* | Revert https://android-git.corp.google.com/g/#change,31178 | Grace Kloba | 2009-11-16 | 1 | -14/+0 |
| | | | as http://b/issue?id=2183371 is finally fixed. | ||||
* | am 5469794f: Avoid constructing the MutexLocker class to avoid two mystery ↵ | Grace Kloba | 2009-10-30 | 1 | -0/+14 |
|\ | | | | | | | | | | | | | | | | | crashes. Merge commit '5469794fd9ad86cd03ba4cf7ef0bc82329362f39' into eclair-mr2 * commit '5469794fd9ad86cd03ba4cf7ef0bc82329362f39': Avoid constructing the MutexLocker class to avoid | ||||
| * | Avoid constructing the MutexLocker class to avoid | Grace Kloba | 2009-10-27 | 1 | -0/+14 |
| | | | | | | two mystery crashes. | ||||
| * | Apparently we can't use atomic_inc/dec version as it | Grace Kloba | 2009-10-21 | 1 | -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, for | Grace Kloba | 2009-10-20 | 1 | -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 int | Grace Kloba | 2009-10-21 | 1 | -1/+1 |
| | | | | | | instead of void. | ||||
* | | Merge webkit.org at R49305 : Fix merge conflicts. | Steve Block | 2009-10-20 | 1 | -4/+0 |
| | | | | | | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a | ||||
* | | Merge webkit.org at R49305 : Automatic merge by git. | Steve Block | 2009-10-20 | 1 | -4/+13 |
|/ | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
* | Fix ReadWriteLock class problem. Will upstream this asap | Andrei Popescu | 2009-08-14 | 1 | -3/+3 |
| | |||||
* | Fix some build errors. | Ben Murdoch | 2009-08-13 | 1 | -0/+4 |
| | |||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 1 | -6/+30 |
| | |||||
* | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 1 | -17/+47 |
| | | | | Automated import of CL 145796 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 1 | -16/+19 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -0/+284 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -284/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 1 | -0/+284 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 1 | -255/+0 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 1 | -0/+255 |