Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge webkit.org at r54731 : Initial merge by git | Steve Block | 2010-02-16 | 14 | -57/+487 |
| | | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a | ||||
* | Merge webkit.org at r54340 : Initial merge by git | Steve Block | 2010-02-15 | 5 | -12/+128 |
| | | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44 | ||||
* | Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for ↵ | Steve Block | 2010-02-04 | 1 | -9/+0 |
| | | | | | | other platforms. Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e | ||||
* | Merge webkit.org at r54127 : Initial merge by git | Steve Block | 2010-02-04 | 89 | -1015/+4130 |
| | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 | ||||
* | resolved conflicts for merge of 3f4b1969 to master | Steve Block | 2010-01-20 | 2 | -1/+10 |
|\ | | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851 | ||||
| * | Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵ | Steve Block | 2010-01-19 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+16 |
|/ | | | | | | | | 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 | 59 | -3491/+2984 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Android History unforking pt2: BackForwardList changes. Fire a notification ↵ | Ben Murdoch | 2009-12-03 | 2 | -1/+15 |
| | | | | | | | | to the FrameLoaderClient that the BackForwardList has been modified. This needs to be upstreamed to webkit.org. Change-Id: I14633c51276bd92ed56139b4c473cc8ac9bacb72 | ||||
* | Merge webkit.org at r50258 : Initial merge by git. | Steve Block | 2009-11-10 | 45 | -437/+2516 |
| | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 | ||||
* | Merge webkit.org at R49305 : Automatic merge by git. | Steve Block | 2009-10-20 | 62 | -1171/+5710 |
| | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 105 | -782/+9980 |
| | |||||
* | Implements a mechanism that limit the growth of the application cache | Andrei Popescu | 2009-07-21 | 2 | -0/+11 |
| | |||||
* | Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. ↵ | Ben Murdoch | 2009-05-15 | 5 | -4/+25 |
| | | | | 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 | 19 | -136/+854 |
| | | | | | | 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 | 35 | -268/+3802 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 51 | -0/+26090 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 51 | -26090/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 60 | -3182/+10837 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 7 | -10/+6611 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 62 | -0/+11834 |