Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge WebKit at r75993: Initial merge by git. | Ben Murdoch | 2011-05-16 | 41 | -16929/+0 |
| | | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3 | ||||
* | Merge WebKit at r75315: Initial merge by git. | Steve Block | 2011-05-12 | 5 | -8/+85 |
| | | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84 | ||||
* | Merge WebKit at r74534: Initial merge by git. | Ben Murdoch | 2011-05-10 | 11 | -29/+128 |
| | | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb | ||||
* | Merge WebKit at r72805: Initial merge by Git | Steve Block | 2011-01-06 | 1 | -5/+0 |
| | | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 | ||||
* | Merge WebKit at r73109: Initial merge by git. | Shimeng (Simon) Wang | 2010-12-22 | 8 | -37/+72 |
| | | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8 | ||||
* | Merge WebKit at r72274: Initial merge by git. | Russell Brenner | 2010-12-02 | 7 | -26/+50 |
| | | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb | ||||
* | Merge WebKit at r71558: Initial merge by git. | Teng-Hui Zhu | 2010-11-17 | 8 | -43/+271 |
| | | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c | ||||
* | Merge Webkit at r70949: Initial merge by git. | John Reck | 2010-11-09 | 6 | -80/+92 |
| | | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e | ||||
* | Merge WebKit at r70209: Initial merge by Git | Ben Murdoch | 2010-10-26 | 10 | -275/+248 |
| | | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e | ||||
* | Merge WebKit at r68651 : Initial merge by git. | Kristian Monsen | 2010-10-07 | 14 | -131/+162 |
| | | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12 | ||||
* | Merge WebKit at r67908: Initial merge by Git | Steve Block | 2010-09-29 | 11 | -96/+192 |
| | | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972 | ||||
* | Merge WebKit at r67178 : Initial merge by git. | Iain Merrick | 2010-09-16 | 2 | -3/+3 |
| | | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18 | ||||
* | Merge WebKit at r66666 : Initial merge by git. | Kristian Monsen | 2010-09-11 | 7 | -30/+36 |
| | | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f | ||||
* | Merge WebKit at r66079 : Initial merge by git | Steve Block | 2010-09-02 | 9 | -14/+17 |
| | | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7 | ||||
* | Merge WebKit at r65615 : Initial merge by git. | Iain Merrick | 2010-08-23 | 3 | -10/+16 |
| | | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79 | ||||
* | Merge WebKit at r65072 : Initial merge by git. | Ben Murdoch | 2010-08-12 | 8 | -21/+45 |
| | | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585 | ||||
* | Merge WebKit at r64523 : Initial merge by git. | Steve Block | 2010-08-09 | 5 | -13/+19 |
| | | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4 | ||||
* | Merge WebKit at r64264 : Initial merge by git. | Kristian Monsen | 2010-08-04 | 9 | -28/+92 |
| | | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1 | ||||
* | Merge WebKit at r63859 : Initial merge by git. | Ben Murdoch | 2010-07-27 | 2 | -1/+24 |
| | | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62 | ||||
* | Merge WebKit at r63173 : Initial merge by git. | Leon Clarke | 2010-07-20 | 4 | -14/+23 |
| | | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44 | ||||
* | Merge WebKit at r62496: Initial merge by git | Steve Block | 2010-07-09 | 8 | -20/+19 |
| | | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2 | ||||
* | Merge WebKit at r61871: Initial merge by git. | Kristian Monsen | 2010-07-02 | 16 | -43/+431 |
| | | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5 | ||||
* | Merge webkit.org at r61121: Initial merge by git. | Ben Murdoch | 2010-06-16 | 11 | -29/+107 |
| | | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760 | ||||
* | Merge webkit.org at r60469 : Initial merge by git. | Leon Clarke | 2010-06-08 | 4 | -10/+87 |
| | | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234 | ||||
* | Merge WebKit at r60074: Initial merge by git | Steve Block | 2010-05-27 | 3 | -62/+39 |
| | | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7 | ||||
* | Merge WebKit at r59636: Initial merge by git | Kristian Monsen | 2010-05-25 | 16 | -493/+560 |
| | | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91 | ||||
* | Merge Webkit at r58956: Initial merge by Git. | Ben Murdoch | 2010-05-14 | 7 | -348/+273 |
| | | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228 | ||||
* | Merge webkit.org at r58033 : Initial merge by git | Steve Block | 2010-05-11 | 19 | -484/+626 |
| | | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 | ||||
* | Merge webkit.org at r55033 : Initial merge by git | Steve Block | 2010-04-27 | 10 | -1/+182 |
| | | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5 | ||||
* | Merge webkit.org at r54731 : Initial merge by git | Steve Block | 2010-02-16 | 7 | -52/+225 |
| | | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a | ||||
* | Merge webkit.org at r54340 : Initial merge by git | Steve Block | 2010-02-15 | 1 | -3/+4 |
| | | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44 | ||||
* | Merge webkit.org at r54127 : Initial merge by git | Steve Block | 2010-02-04 | 14 | -28/+550 |
| | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 | ||||
* | resolved conflicts for merge of 3f4b1969 to master | Steve Block | 2010-01-20 | 1 | -1/+1 |
|\ | | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851 | ||||
| * | Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵ | Steve Block | 2010-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | WebCore/bridge/Bridge See http://trac.webkit.org/changeset/53464 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in PluginView.cpp to add a temporary ANDROID guard. Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4 | ||||
* | | Cherry-pick WebKit change 52103 - Add a client based Geolocation provider | Steve Block | 2010-01-18 | 1 | -1/+1 |
|/ | | | | | | | | This is required to ease the process of upstreaming the Geolocation maximumAge handling code. Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this. Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3 | ||||
* | Merge webkit.org at r51976 : Initial merge by git. | Steve Block | 2009-12-17 | 26 | -2553/+872 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Merge webkit.org at r50258 : Initial merge by git. | Steve Block | 2009-11-10 | 18 | -295/+938 |
| | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 | ||||
* | Merge webkit.org at R49305 : Automatic merge by git. | Steve Block | 2009-10-20 | 26 | -827/+2569 |
| | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 37 | -626/+3929 |
| | |||||
* | Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. ↵ | Ben Murdoch | 2009-05-15 | 3 | -0/+19 |
| | | | | This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk. | ||||
* | AI 146110: add missing files to webkit | Cary Clark | 2009-04-14 | 10 | -105/+236 |
| | | | | | | brings it in sync with webkit svn cl 42046 Automated import of CL 146110 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 21 | -158/+1358 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 25 | -0/+9331 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 25 | -9331/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 26 | -1618/+3965 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 4 | -8/+12 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 28 | -0/+6980 |