Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of f6d49173 to master | Derek Sollenberger | 2012-03-12 | 7 | -108/+19 |
|\ | |||||
| * | am ff1fac5a: am 1969832e: Merge "Update WebKit with necessary changes for the... | Derek Sollenberger | 2012-03-12 | 7 | -112/+19 |
| |\ | |||||
| | * | am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge." | Derek Sollenberger | 2012-03-12 | 7 | -112/+19 |
| | |\ | |||||
| | | * | Merge "Update WebKit with necessary changes for the Skia merge." | Derek Sollenberger | 2012-03-12 | 7 | -112/+19 |
| | | |\ | |||||
| | | | * | Update WebKit with necessary changes for the Skia merge. | Derek Sollenberger | 2012-03-06 | 7 | -112/+19 |
| | | |/ | |||||
* | | | | Merge "Add back auto-completion and auto-fill." | George Mount | 2012-03-12 | 5 | -43/+129 |
|\ \ \ \ | |||||
| * | | | | Add back auto-completion and auto-fill. | George Mount | 2012-03-09 | 5 | -43/+129 |
* | | | | | Introduce a LayerContent interface | Nicolas Roard | 2012-03-09 | 15 | -130/+406 |
* | | | | | Merge "Delete nativeSubtractLayers" | John Reck | 2012-03-09 | 3 | -64/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Delete nativeSubtractLayers | John Reck | 2012-03-09 | 3 | -64/+0 |
* | | | | | | Merge "Replace picture count with the SurfaceCollection count" | Chris Craik | 2012-03-09 | 25 | -105/+76 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace picture count with the SurfaceCollection count | Chris Craik | 2012-03-09 | 25 | -105/+76 |
| |/ / / / / | |||||
* | | | | | | Merge "Use audio_policy_output_flags_t consistently" | Glenn Kasten | 2012-03-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use audio_policy_output_flags_t consistently | Glenn Kasten | 2012-03-09 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge "add bounds check in layer merging" | Chris Craik | 2012-03-09 | 1 | -13/+15 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | add bounds check in layer merging | Chris Craik | 2012-03-08 | 1 | -13/+15 |
| |/ / / / | |||||
* | | | | | Merge "remove TextureTileInfo and readyfor check" | Chris Craik | 2012-03-09 | 5 | -114/+12 |
|\ \ \ \ \ | |||||
| * | | | | | remove TextureTileInfo and readyfor check | Chris Craik | 2012-03-08 | 5 | -114/+12 |
| |/ / / / | |||||
* | | | | | Merge "remove hacky workaround for a scrolling bug" | Victoria Lease | 2012-03-09 | 1 | -3/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | remove hacky workaround for a scrolling bug | Victoria Lease | 2012-03-07 | 1 | -3/+1 |
* | | | | | Merge "partial multi-layer invalidates in layergroups" | Chris Craik | 2012-03-08 | 1 | -12/+16 |
|\ \ \ \ \ | |||||
| * | | | | | partial multi-layer invalidates in layergroups | Chris Craik | 2012-03-07 | 1 | -12/+16 |
* | | | | | | Change the way we apply fixed position to layers | Nicolas Roard | 2012-03-08 | 8 | -118/+147 |
|/ / / / / | |||||
* | | | | | Refactor LayerAndroid to add iframe subclasses | Nicolas Roard | 2012-03-07 | 15 | -105/+311 |
* | | | | | Merge "UI-side layer merging" | Chris Craik | 2012-03-07 | 12 | -129/+348 |
|\ \ \ \ \ | |||||
| * | | | | | UI-side layer merging | Chris Craik | 2012-03-07 | 12 | -129/+348 |
* | | | | | | Merge "Fix cursor rings for buttons" | John Reck | 2012-03-06 | 3 | -8/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix cursor rings for buttons | John Reck | 2012-03-06 | 3 | -8/+26 |
* | | | | | | | Merge "Support passing focus to the chrome" | John Reck | 2012-03-06 | 3 | -2/+34 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | Support passing focus to the chrome | John Reck | 2012-03-06 | 3 | -2/+34 |
| |/ / / / | |||||
* | | | | | Merge "Refactor LayerAndroid and add a FixedLayerAndroid class" | Nicolas Roard | 2012-03-06 | 10 | -309/+562 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Refactor LayerAndroid and add a FixedLayerAndroid class | Nicolas Roard | 2012-03-06 | 10 | -309/+562 |
* | | | | | Merge "operation and filter cleanup" | Chris Craik | 2012-03-05 | 6 | -98/+8 |
|\ \ \ \ \ | |||||
| * | | | | | operation and filter cleanup | Chris Craik | 2012-03-05 | 6 | -98/+8 |
* | | | | | | Merge "Fix platformLayerIdFromNode lookup" | John Reck | 2012-03-05 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix platformLayerIdFromNode lookup | John Reck | 2012-03-05 | 1 | -0/+2 |
* | | | | | | | Merge "Fix scrollable divs" | John Reck | 2012-03-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Fix scrollable divs | John Reck | 2012-03-05 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge "Removes unused classes" | Nicolas Roard | 2012-03-05 | 2 | -139/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Removes unused classes | Nicolas Roard | 2012-03-05 | 2 | -139/+0 |
* | | | | | | Merge "Delete more unused stuff from navcache" | John Reck | 2012-03-05 | 3 | -633/+19 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Delete more unused stuff from navcache | John Reck | 2012-03-05 | 3 | -633/+19 |
| |/ / / / | |||||
* | | | | | Fix scaling issue with translation | Teng-Hui Zhu | 2012-03-05 | 1 | -1/+14 |
* | | | | | add more logs and format correction | Teng-Hui Zhu | 2012-03-05 | 1 | -12/+14 |
|/ / / / | |||||
* | | | | Merge "Pass transform matrix in draw instead of through painter" | Chris Craik | 2012-03-02 | 15 | -39/+37 |
|\ \ \ \ | |||||
| * | | | | Pass transform matrix in draw instead of through painter | Chris Craik | 2012-03-02 | 15 | -39/+37 |
* | | | | | Merge "Fix crash when getting input text on an empty node." | George Mount | 2012-03-02 | 1 | -8/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix crash when getting input text on an empty node. | George Mount | 2012-03-02 | 1 | -8/+10 |
* | | | | | Merge "Fix m.movies.com crash" | John Reck | 2012-03-02 | 1 | -5/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Fix m.movies.com crash | John Reck | 2012-03-01 | 1 | -5/+12 |