summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | AI 144643: a few more fixes for the automated merge toolCary Clark2009-04-061-0/+1
| | | | | | | | | | | | | | | | don't include chromium files in JavaScriptCore add a list of generated files to exclude BUG=1553405 Automated import of CL 144643
* | 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
* | AI 143486: Update diff tool rules in webkit makefiles.Cary Clark2009-03-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Anticipating another merge with webkit, these changes update the rules to automatically exclude files we've already removed manually. A new rule allows including files that are not yet checked into webkit's makefiles (e.g., Touch). The exclude rules no longer need to be alphabetized, but the makefile sources still do -- so fix a couple of entries that are out of order. BUG=1553405 Automated import of CL 143486
* | Automated import from //branches/master/...@142546,142546Cary Clark2009-03-251-11/+12
|/
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-05345-20329/+44122
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031604-0/+375948
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031604-375936/+0
|
* auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-034-102/+90
|
* auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-024-90/+102
|
* auto import from //branches/cupcake/...@131421The Android Open Source Project2009-02-131-1/+6
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-2/+2
|
* 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-17489-53512/+111062
|
* Initial ContributionThe Android Open Source Project2008-10-211258-2511/+223188
|
* external/webkit r30707Upstream1970-01-12329-0/+97693