summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1423-57/+268
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1169-1287/+841
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2722-649/+765
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1640-397/+551
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-155-40/+49
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Take theirs for changes to JavaScript string ↵Steve Block2010-02-043-33/+81
| | | | | | | | | | | addition. The conflict is due to the fact that we cherry-picked a WebKit change http://trac.webkit.org/changeset/51978 to fix a bug. This change updates all files touched by this change to match webkit.org. See https://android-git.corp.google.com/g/#change,36411 Change-Id: Ie17c59467b74f3bf3be1149bebe086b92b30afc4
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04101-2241/+2480
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-picks a WebKit change to revert recent changes to String addition for ↵Steve Block2010-01-043-87/+28
| | | | | | | | | | | | | | | | | JSC. WebKit change http://trac.webkit.org/changeset/51975 modified String addition in JSC to use ropes. However, the change was incorrect, so was rolled back in http://trac.webkit.org/changeset/51978. The last WebKit merge was to revision r51976, so picked up the initial, broken change only. This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the original change. Bug: 2336856 Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-1750-534/+1245
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1060-615/+686
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-20143-1214/+3425
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1962-969/+340
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-1862-340/+969
|
* Merge in WebKit r47029.Ben Murdoch2009-08-1183-1162/+3078
|
* Get WebKit r44544.Feng Qian2009-06-17122-3377/+4201
|
* AI 145799: Added back the ANDROID_INSTRUMENT for JS.Grace Kloba2009-04-101-0/+12
| | | | Automated import of CL 145799
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-1027-141/+672
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-05152-3082/+9304
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03141-0/+21018
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03141-21018/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-17141-0/+21018