| 8a0914b749bbe7da7768e07a7db5c6d4bb09472b |
|
15-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 33fc8ca0ce504ea94c9b038e11968187fc10d13e |
|
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Take theirs for changes to JavaScript string 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
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| d0825bca7fe65beaee391d30da42e937db621564 |
|
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 10ceded39bd4b259c4921d2a07d322d5e1244ba6 |
|
04-Jan-2010 |
Steve Block <steveblock@google.com> |
Cherry-picks a WebKit change to revert recent changes to String addition for 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
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 643ca7872b450ea4efacab6188849e5aac2ba161 |
|
15-Dec-2009 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| cac0f67c402d107cdb10971b95719e2ff9c7c76b |
|
05-Nov-2009 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf |
|
08-Oct-2009 |
Steve Block <steveblock@google.com> |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 |
|
19-Aug-2009 |
Andrei Popescu <andreip@google.com> |
Revert "Merge WebKit r47420"
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| d227fc870c7a697500a3c900c31baf05fb9a8524 |
|
18-Aug-2009 |
Ben Murdoch <benm@google.com> |
Merge WebKit r47420
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 |
|
11-Aug-2009 |
Ben Murdoch <benm@google.com> |
Merge in WebKit r47029.
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 5f1ab04193ad0130ca8204aadaceae083aca9881 |
|
17-Jun-2009 |
Feng Qian <fqian@google.com> |
Get WebKit r44544.
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|
| 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 |
|
11-Apr-2009 |
Feng Qian <> |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
/external/webkit/JavaScriptCore/jit/JITStubs.cpp
|