Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge webkit.org at r51976 : Initial merge by git. | Steve Block | 2009-12-17 | 25 | -270/+646 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Merge webkit.org at r50258 : Initial merge by git. | Steve Block | 2009-11-10 | 12 | -70/+86 |
| | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 | ||||
* | Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵ | Steve Block | 2009-10-27 | 1 | -8/+2 |
| | | | | | | | | | | to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba | ||||
* | Merge webkit.org at R49305 : Fix merge conflicts. | Steve Block | 2009-10-20 | 1 | -14/+0 |
| | | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a | ||||
* | Merge webkit.org at R49305 : Automatic merge by git. | Steve Block | 2009-10-20 | 51 | -426/+1007 |
| | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
* | Cherry pick of WebKit commit r49018, fix for b/2067397. Enable ↵ | Ben Murdoch | 2009-10-06 | 1 | -23/+37 |
| | | | | Database.changVersion(). | ||||
* | Revert "Merge WebKit r47420" | Andrei Popescu | 2009-08-19 | 12 | -238/+9 |
| | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. | ||||
* | Merge WebKit r47420 | Ben Murdoch | 2009-08-18 | 12 | -9/+238 |
| | |||||
* | Continue with linker error fixes. | Ben Murdoch | 2009-08-17 | 1 | -0/+5 |
| | |||||
* | r47029: Merges WebCore/page, plugins and storage. | Ben Murdoch | 2009-08-12 | 5 | -44/+0 |
| | |||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 34 | -939/+1211 |
| | |||||
* | Cherry pick fix for webkit bug 25711 ↵ | Ben Murdoch | 2009-07-07 | 4 | -1/+54 |
| | | | | (https://bugs.webkit.org/show_bug.cgi?id=25711) landed in r45594. Fixes a bug in the Database API that caused the underlying SQLite DB to become locked until browser restart. | ||||
* | Fix V8 build. | Feng Qian | 2009-06-22 | 1 | -0/+1 |
| | |||||
* | Merge commit 'goog/master' into webkit_merge | Feng Qian | 2009-06-18 | 22 | -4/+95 |
|\ | | | | | | | | | | | | | | | Resolved conflicts: WebCore/Android.mk WebCore/storage/LocalStorageArea.h WebCore/storage/SessionStorageArea.cpp WebCore/storage/StorageEvent.cpp | ||||
| * | Enable DOM Storage in master with JSC bindings. | Ben Murdoch | 2009-06-15 | 22 | -3/+95 |
| | | |||||
* | | Get WebKit r44544. | Feng Qian | 2009-06-17 | 16 | -102/+210 |
|/ | |||||
* | Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. ↵ | Ben Murdoch | 2009-05-15 | 34 | -16/+145 |
| | | | | This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk. | ||||
* | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 11 | -154/+17 |
| | | | | Automated import of CL 145796 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 13 | -55/+88 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 62 | -0/+7146 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 62 | -7146/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 48 | -180/+2480 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 15 | -20/+16 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 40 | -0/+4850 |