summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/wtf
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
|
* 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 : Initial merge by git.Steve Block2009-12-1732-480/+754
| | | | 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
* 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
* 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
* 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-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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-1010-19/+57
| | | | 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.
* | 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-2029-141/+710
|/ | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-196-178/+31
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-186-31/+178
|
* 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-1156-252/+2302
|
* Remove the WebIconDatabase thread attachment since ThreadingPthreads does it.Patrick Scott2009-07-291-0/+1
| | | | | Also, delete threadData if pthread_create fails. This is a rare occurance but we don't want to leak memory just in case.
* Get WebKit r44544.Feng Qian2009-06-1743-612/+3526
|
* Remove unneeded SKIA_SGL platform flagMike Reed2009-05-011-1/+0
|
* Merge commit 'goog/master' into merge_webkit_from_masterFeng Qian2009-04-291-0/+1
|\
| * First cut at sharing graphics code with chromeMike Reed2009-04-281-0/+1
| | | | | | | | | | | | | | Introduce (short lived I hope) platform SKIA_SGL, signifying that this code is used by both platforms (SKIA) and (SGL). This change is meant to be the foundation for more significant sharing later (e.g. TransformationMatrix, Pattern, Gradient, etc.)
* | Make WebCore built with V8.Feng Qian2009-04-241-0/+3
|/ | | | Picked up several new files from Chrome port.
* AI 146302: Android thread registration. Sent to webkit.org in ↵Ben Murdoch2009-04-151-0/+40
| | | | | | https://bugs.webkit.org/show_bug.cgi?id=25091 Automated import of CL 146302
* AI 146153: Make the TextDialog invisible, so that we only show WebKit's ↵Leon Scroggins2009-04-141-1/+1
| | | | | | | | | | | | | | | | | | rendering of the textfield, yet we retain the benefits of having the TextDialog. Frame.cpp: Removed a line that should not be there anyway. Somehow when merging in Apple's ENABLE(TEXT_CARET) changes we left in a line that disables the blinking Cursor. Platform.h: Let WebKit draw the cursor. RenderThemeAndroid.cpp: Make the active selection color (the color of a selection in an active <textfield> or <textarea>) visible, and match the selection color shown in other places in Android. WebViewCore.cpp: Make the focused node's document's focus controller active. This allows webkit to draw the cursor. TextDialog.java: Set WillNotDraw to true, and remove our background, so that the TextDialog is completely invisible. Note that I have not changed its visibility to View.VISIBLE, which would have other undesired effects (would not accept touch events, for example). Since we are not drawing, remove onPreDraw, which is no longer necessary. In onSelectionChanged, pass a message to webkit telling it that the selection has changed. It is important that the two threads always agree (albeit webkit may be behind) because the user will now only see the selection drawn by webkit. Remove some old flawed code whose purpose was to keep the selection up to date and do not send key events for arrow keys (which would mess up the selection that was correct thanks to onSelectionChanged). BUG=1781070,1712752,916193,1411370,1160999,1775425,1354814 Automated import of CL 146153
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-1041-371/+1225
| | | | Automated import of CL 145796
* AI 143526: Clear execute bit on C++ source files.Cary Clark2009-03-301-0/+0
| | | | | | | | | Our execute bit is out of sync with webkit.org, so make them the same. This helps keep the diff tool from getting confused. BUG=1553405 Automated import of CL 143526
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0551-529/+4386
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0372-0/+18166
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0372-18166/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-18/+29
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1763-1486/+6242
|
* Initial ContributionThe Android Open Source Project2008-10-2120-1826/+138
|
generated by cgit v1.1 at 2025-04-02 11:19:27 +0000