| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Makes a number of changes to ease future merging with and upstreaming to ↵ | Steve Block | 2009-10-22 | 1 | -8/+6 |
| | | | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1 | ||||
| * | Merge webkit.org at R49305 : PluginView::init and destructor have been moved ↵ | Steve Block | 2009-10-20 | 1 | -0/+5 |
| | | | | | | | | | to common code. See http://trac.webkit.org/changeset/47966 and http://trac.webkit.org/changeset/47967 Change-Id: If5b9594b032d5a7d456fe3bb6092eafef3655c34 | ||||
| * | Merge webkit.org at R49305 : Fix merge conflicts. | Steve Block | 2009-10-20 | 1 | -9/+1 |
| | | | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a | ||||
| * | Merge webkit.org at R49305 : Automatic merge by git. | Steve Block | 2009-10-20 | 1 | -31/+130 |
| | | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
| * | Fixes a bunch of WebKit whitespace discrepancies between Android and ↵ | Steve Block | 2009-10-14 | 1 | -3/+3 |
| | | | | | | | | | webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch. | ||||
| * | Fix first set of linker errors. | Ben Murdoch | 2009-08-17 | 1 | -2/+2 |
| | | |||||
| * | PluginView.cpp fix | Andrei Popescu | 2009-08-17 | 1 | -2/+2 |
| | | |||||
| * | r47029: Merges WebCore/page, plugins and storage. | Ben Murdoch | 2009-08-12 | 1 | -10/+2 |
| | | |||||
| * | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 1 | -16/+230 |
| | | |||||
| * | Merge commit 'goog/master' into webkit_merge | Feng Qian | 2009-06-18 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | | | Resolved conflicts: WebCore/Android.mk WebCore/storage/LocalStorageArea.h WebCore/storage/SessionStorageArea.cpp WebCore/storage/StorageEvent.cpp | ||||
| | * | Adding touch events for plugins. | Derek Sollenberger | 2009-06-18 | 1 | -0/+8 |
| | | | |||||
| * | | Get WebKit r44544. | Feng Qian | 2009-06-17 | 1 | -4/+12 |
| |/ | |||||
| * | Add plugin plumbing with V8 binding. | Feng Qian | 2009-05-01 | 1 | -0/+29 |
| | | | | | | Hook up plugin with V8 binding. You can take the patch and play on your local machine. It is almost there, I need do more testing. | ||||
| * | Make WebCore built with V8. | Feng Qian | 2009-04-24 | 1 | -6/+23 |
| | | | | | Picked up several new files from Chrome port. | ||||
| * | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 1 | -5/+2 |
| | | | | | Automated import of CL 145796 | ||||
| * | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 1 | -10/+59 |
| | | |||||
| * | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -0/+922 |
| | | |||||
| * | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -922/+0 |
| | | |||||
| * | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 1 | -0/+922 |
 |
index : external_webkit.git | |
| external/webkit | git repository hosting |
| summaryrefslogtreecommitdiffstats |