Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of f6d49173 to master | Derek Sollenberger | 2012-03-12 | 6 | -108/+18 |
|\ | |||||
| * | am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge." | Derek Sollenberger | 2012-03-12 | 6 | -112/+18 |
| |\ | |||||
| | * | Update WebKit with necessary changes for the Skia merge. | Derek Sollenberger | 2012-03-06 | 6 | -112/+18 |
* | | | Introduce a LayerContent interface | Nicolas Roard | 2012-03-09 | 11 | -114/+378 |
* | | | Merge "Delete nativeSubtractLayers" | John Reck | 2012-03-09 | 2 | -42/+0 |
|\ \ \ | |||||
| * | | | Delete nativeSubtractLayers | John Reck | 2012-03-09 | 2 | -42/+0 |
* | | | | Merge "Replace picture count with the SurfaceCollection count" | Chris Craik | 2012-03-09 | 23 | -102/+75 |
|\ \ \ \ | |||||
| * | | | | Replace picture count with the SurfaceCollection count | Chris Craik | 2012-03-09 | 23 | -102/+75 |
| |/ / / | |||||
* | | | | 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 |
* | | | | remove TextureTileInfo and readyfor check | Chris Craik | 2012-03-08 | 5 | -114/+12 |
|/ / / | |||||
* | | | 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 | 6 | -88/+117 |
|/ / / | |||||
* | | | Refactor LayerAndroid to add iframe subclasses | Nicolas Roard | 2012-03-07 | 12 | -97/+290 |
* | | | UI-side layer merging | Chris Craik | 2012-03-07 | 10 | -128/+333 |
* | | | Merge "Refactor LayerAndroid and add a FixedLayerAndroid class" | Nicolas Roard | 2012-03-06 | 8 | -274/+471 |
|\ \ \ | |||||
| * | | | Refactor LayerAndroid and add a FixedLayerAndroid class | Nicolas Roard | 2012-03-06 | 8 | -274/+471 |
* | | | | 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 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 |
* | | | | 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 |
|/ / / | |||||
* | | | Pass transform matrix in draw instead of through painter | Chris Craik | 2012-03-02 | 15 | -39/+37 |
* | | | Fix iframe, for reals! | John Reck | 2012-03-01 | 8 | -89/+64 |
* | | | Merge "Cleanup GL resource for HTML5 Video." | Teng-Hui Zhu | 2012-03-01 | 4 | -129/+165 |
|\ \ \ | |||||
| * | | | Cleanup GL resource for HTML5 Video. | Teng-Hui Zhu | 2012-03-01 | 4 | -129/+165 |
* | | | | fix stalls in tile updates | Chris Craik | 2012-02-29 | 2 | -2/+10 |
* | | | | Merge "layer rendering cleanup/rewrite" | Chris Craik | 2012-02-28 | 31 | -1186/+1170 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | layer rendering cleanup/rewrite | Chris Craik | 2012-02-28 | 31 | -1186/+1170 |
* | | | | Merge "Delete the GL shader resources in a cleaner way" | Teng-Hui Zhu | 2012-02-28 | 5 | -24/+55 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Delete the GL shader resources in a cleaner way | Teng-Hui Zhu | 2012-02-28 | 5 | -24/+55 |
* | | | | removed unused vars/functions | Chris Craik | 2012-02-28 | 5 | -12/+1 |
|/ / / | |||||
* | | | Merge "Delete navcache native" | John Reck | 2012-02-27 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Delete navcache native | John Reck | 2012-02-27 | 1 | -0/+3 |
* | | | | Merge "Gl resource should be re-initialized after EGL context changed" | Teng-Hui Zhu | 2012-02-27 | 3 | -5/+19 |
|\ \ \ \ | |||||
| * | | | | Gl resource should be re-initialized after EGL context changed | Teng-Hui Zhu | 2012-02-27 | 3 | -5/+19 |
* | | | | | Merge "Fix iframe webkit positioning" | Nicolas Roard | 2012-02-27 | 5 | -6/+32 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix iframe webkit positioning | Nicolas Roard | 2012-02-27 | 5 | -6/+32 |
* | | | | | Merge "Delete CursorRing" | John Reck | 2012-02-27 | 4 | -264/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Delete CursorRing | John Reck | 2012-02-27 | 4 | -264/+7 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge "Activate the GL error log in release build" | Teng-Hui Zhu | 2012-02-27 | 2 | -13/+65 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Activate the GL error log in release build | Teng-Hui Zhu | 2012-02-24 | 2 | -13/+65 |
* | | | | | Merge "fix scrollable layer inside scrollable layer" | Michael Kolb | 2012-02-24 | 1 | -4/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | fix scrollable layer inside scrollable layer | Michael Kolb | 2012-02-24 | 1 | -4/+7 |
* | | | | | Fix issues when DEBUG turned on | Teng-Hui Zhu | 2012-02-24 | 3 | -5/+8 |
|/ / / / | |||||
* | | | | Merge "Revert "simplify texture generation filters"" | Chris Craik | 2012-02-23 | 12 | -94/+115 |
|\ \ \ \ |