Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix JSC support. | Andrei Popescu | 2009-08-19 | 1 | -1/+1 |
| | |||||
* | Revert "Merge WebKit r47420" | Andrei Popescu | 2009-08-19 | 38 | -779/+41 |
| | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. | ||||
* | Revert "Continue with JSC errors." | Andrei Popescu | 2009-08-19 | 2 | -5/+2 |
| | | | | This reverts commit 76de9f7763de0e4568056a5a26c93030f21e0b90. | ||||
* | Continue with JSC errors. | Ben Murdoch | 2009-08-19 | 2 | -2/+5 |
| | |||||
* | Merge WebKit r47420 | Ben Murdoch | 2009-08-18 | 38 | -41/+779 |
| | |||||
* | Merge commit 'goog/master' into merge | Ben Murdoch | 2009-08-18 | 1 | -67/+84 |
|\ | | | | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp | ||||
| * | Final part of fix to set default values of Geolocation PositionOptions. | Steve Block | 2009-08-13 | 1 | -20/+31 |
| | | | | | | | | Updates to final version submitted to WebKit for bug 27254. | ||||
| * | Correctly sets default values for Geolocation PositionOptions. | Steve Block | 2009-08-11 | 1 | -72/+78 |
| | | | | | | | | | | | | | | This will be submitted to WebKit in bug 27254. This was first commited in change 20268, but this caused problems in the automated build and was subsequently rolled back in change 20415. This change includes the latest comments from the WebKit review. | ||||
* | | Fix left over maunal merges | Andrei Popescu | 2009-08-13 | 1 | -1/+0 |
| | | |||||
* | | Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings. | Ben Murdoch | 2009-08-12 | 1 | -9/+2 |
| | | |||||
* | | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 131 | -1200/+2358 |
|/ | |||||
* | Revert "Correctly sets default values for Geolocation PositionOptions." | Steve Block | 2009-08-07 | 1 | -102/+71 |
| | | | | | This reverts commit 0c9108c0f832d34e6468bf1b3ed4132053c6a0f3. This broke the automated build. Not sure why, as it builds fine on my machine. Rolling back while I investigate. | ||||
* | Correctly sets default values for Geolocation PositionOptions. | Steve Block | 2009-08-07 | 1 | -71/+102 |
| | | | | This will be submitted to WebKit in bug 27254. | ||||
* | Fixes WebKit Geolocation bug 27255. | Steve Block | 2009-07-24 | 2 | -3/+2 |
| | | | | | We should not call the error callback if the success callback raises an exception. This is currently being submitted to WebKit as bug 27255. | ||||
* | Get WebKit r44544. | Feng Qian | 2009-06-17 | 146 | -2335/+2197 |
| | |||||
* | Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. ↵ | Ben Murdoch | 2009-05-15 | 11 | -0/+41 |
| | | | | 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 | 78 | -620/+1669 |
| | | | | Automated import of CL 145796 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 147 | -1662/+2893 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 148 | -0/+15836 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 148 | -15836/+0 |
| | |||||
* | auto import from //branches/cupcake/...@126645 | The Android Open Source Project | 2009-01-15 | 1 | -14/+23 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 174 | -8431/+10951 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 59 | -793/+575 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 102 | -0/+13525 |