Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge webkit.org at r58033 : Initial merge by git | Steve Block | 2010-05-11 | 1 | -8/+49 |
| | | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 | ||||
* | Merge webkit.org at r55033 : Initial merge by git | Steve Block | 2010-04-27 | 1 | -0/+1 |
| | | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5 | ||||
* | Merge webkit.org at r54731 : Initial merge by git | Steve Block | 2010-02-16 | 1 | -4/+2 |
| | | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a | ||||
* | Merge webkit.org at r54127 : Initial merge by git | Steve Block | 2010-02-04 | 1 | -32/+47 |
| | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 | ||||
* | Refactor our touch event code to use the version submitted to webkit.org by ↵ | Ben Murdoch | 2010-01-20 | 1 | -13/+9 |
| | | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0 | ||||
* | Updates Document::setExtraLayoutDelay to reflect recent submission to ↵ | Steve Block | 2010-01-07 | 1 | -9/+10 |
| | | | | | | | | | | | | | webkit.org. setExtraLayoutDelay was an Android addition and was upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32875 Removes Document::extraLayoutDelay by incorporating the extra delay in Document::minimumLayoutDelay. Removes ANDROID_MOBILE guards, as this extra code is not inhernetly specific to Android, and is a no-op if Document::setExtraLayoutDelay is not called. This removes the last uses of ANDROID_MOBILE. Change-Id: I1e18a994f32b29558dcf9a5c76aefab62e9fc13d | ||||
* | Merge webkit.org at r51976 : Initial merge by git. | Steve Block | 2009-12-17 | 1 | -21/+26 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Merge webkit.org at r50258 : Initial merge by git. | Steve Block | 2009-11-10 | 1 | -5/+16 |
| | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 | ||||
* | Makes a number of changes to ease future merging with and upstreaming to ↵ | Steve Block | 2009-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | 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 : Automatic merge by git. | Steve Block | 2009-10-20 | 1 | -152/+185 |
| | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
* | Revert "Merge WebKit r47420" | Andrei Popescu | 2009-08-19 | 1 | -111/+122 |
| | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. | ||||
* | Merge WebKit r47420 | Ben Murdoch | 2009-08-18 | 1 | -122/+111 |
| | |||||
* | Fix the last of the linker errors ! | Ben Murdoch | 2009-08-17 | 1 | -2/+2 |
| | |||||
* | Fix left over maunal merges | Andrei Popescu | 2009-08-13 | 1 | -3/+1 |
| | |||||
* | dom, html and loader merges | Andrei Popescu | 2009-08-12 | 1 | -4/+1 |
| | |||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 1 | -4/+24 |
| | |||||
* | Get WebKit r44544. | Feng Qian | 2009-06-17 | 1 | -55/+65 |
| | |||||
* | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 1 | -61/+27 |
| | | | | Automated import of CL 145796 | ||||
* | Automated import from //branches/master/...@142772,142772 | Grace Kloba | 2009-03-25 | 1 | -1/+1 |
| | |||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 1 | -22/+82 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -0/+1120 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -1120/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 1 | -102/+245 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 1 | -35/+52 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 1 | -0/+960 |