summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
|\
| * Remove chartables.c as it's already included indirectlyJean-Baptiste Queru2009-08-051-1/+1
| |
| * Do not merge.Patrick Scott2009-07-281-0/+41
| | | | | | | | | | | | | | | | | | | | This will attach and detach the native thread to and from the java vm. I believe this was the cause of a crash in donut. Sometimes, the IconDatabase needs to notify the WebCore thread of a new Icon. These callbacks post messages through the vm which causes AttachCurrentThread to be called but no matching DetachCurrentThread when the thread exits. Bug:1977972
* | 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.
* | Remove JavaScript node size in the instrumentation as it is using arena now. ↵Grace Kloba2009-07-012-31/+0
| | | | | | | | Added JSC namespace for the TimeCounter.
* | resolved conflicts for merge of dac9d5be to masterGrace Kloba2009-06-291-0/+10
|\ \ | |/
| * Add JavaScript parsing into instrumentation. Also modify css parsing ↵Grace Kloba2009-06-261-0/+11
| | | | | | | | calculations.
* | Fix V8 build.Feng Qian2009-06-221-1/+2
| |
* | Get WebKit r44544.Feng Qian2009-06-17306-15527/+39582
| |
* | Add V8 makefiles.Feng Qian2009-06-111-0/+0
| | | | | | | | Not exact match of JSC build because some Makefiles have to be splitted into two. I use Android.v8...mk.
* | Restore old-style Makefiles.Feng Qian2009-06-111-1/+37
| | | | | | | | | | | | It is easier to work with merge tool. Will add a separate set of Makefiles for V8. Add Android.v8.mk as a reference.
* | Fix double-definition of jsc_pcre_default_tables.Jack Palevich2009-05-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The generated file chartables.c was being both explicitly #included inside of pcre_tables.cpp and also added to LOCAL_GENERATED_SOURCES. This lead to a duplicate symbol definition. The reason this ever worked was that the Android build system accidentally ignored ".c" files in LOCAL_GENERATED_SOURCES. Now that the .c files are being compiled the problem is exposed. Fixed by simply not adding chartables.c to LOCAL_GENERATED_SOURCES.
* | 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.
* | | Move WTF files into Android.wtf.mkFeng Qian2009-04-212-37/+42
|/ / | | | | | | This file can be shared by both JavaScriptCore and V8 builds.
* | 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 145799: Added back the ANDROID_INSTRUMENT for JS.Grace Kloba2009-04-102-4/+12
| | | | | | | | Automated import of CL 145799
* | AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-10134-4523/+11144
| | | | | | | | Automated import of CL 145796