summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/runtime/Operations.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-7/+0
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Take theirs for changes to JavaScript string ↵Steve Block2010-02-041-5/+6
| | | | | | | | | | | 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
* Cherry-picks a WebKit change to revert recent changes to String addition for ↵Steve Block2010-01-041-6/+5
| | | | | | | | | | | | | | | | | 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-171-11/+8
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Get WebKit r44544.Feng Qian2009-06-171-9/+9
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-0/+66
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-0/+55
generated by cgit v1.1 at 2025-05-15 01:30:39 +0000