summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "Fix hardcoded font path. Allow adding new font path thru Skia changes....Billy Hewlett2012-06-071-49/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix hardcoded font path. Allow adding new font path thru Skia changes.Billy Hewlett2012-06-071-49/+17
* | | | | | | | | | | Merge "Use scoped_refptr's rather than naked ptrs."Selim Gurun2012-06-071-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use scoped_refptr's rather than naked ptrs.Selim Gurun2012-06-071-5/+5
* | | | | | | | | | | | Merge "Fixed flipped selection handles."George Mount2012-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed flipped selection handles.George Mount2012-06-061-1/+1
* | | | | | | | | | | | | Merge "Fix build warning."George Mount2012-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix build warning.George Mount2012-06-061-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Revert "Fix hardcoded font path. Allow adding new font path thru Skia ...Billy Hewlett2012-06-071-15/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "Fix hardcoded font path. Allow adding new font path thru Skia changes...Billy Hewlett2012-06-071-15/+47
* | | | | | | | | | | | | Merge "Fix hardcoded font path. Allow adding new font path thru Skia changes....Billy Hewlett2012-06-071-47/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix hardcoded font path. Allow adding new font path thru Skia changes.Billy Hewlett2012-06-041-47/+15
* | | | | | | | | | | | | am f1274677: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| | | * | | | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / | | | | | |/| | | | | | | |
* | | | | | | | | | | | | | Merge "Fix scrolling behavior for text input and textarea."George Mount2012-06-062-23/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix scrolling behavior for text input and textarea.George Mount2012-06-062-23/+19
* | | | | | | | | | | | | | am 3b9c97dd: am 7da43ef8: Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 7da43ef8: Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fix fake bold for fallback fonts.Victoria Lease2012-05-313-2/+16
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | am 16a85ada: am d3fa9c80: Reduce base layer false clip size to avoid rounding...Chris Craik2012-06-052-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am d3fa9c80: Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am a70a7851: am 988183e3: Size change on the base surface invalidates the lar...Chris Craik2012-06-051-8/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | / / / / / / / / / | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am 988183e3: Size change on the base surface invalidates the larger of the ne...Chris Craik2012-06-041-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Size change on the base surface invalidates the larger of the new/old dimensionsChris Craik2012-06-041-8/+18
| | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge "Support selections within scrollable text areas."George Mount2012-06-042-40/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Support selections within scrollable text areas.George Mount2012-06-042-40/+56
* | | | | | | | | | | | Merge "Change from left/right to base/extent for selection handles."George Mount2012-06-044-23/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | / / / / / | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Change from left/right to base/extent for selection handles.George Mount2012-06-014-23/+62
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | am c2973319: am 06100d01: Merge "Disable clipping on the base surface" into j...Chris Craik2012-06-022-11/+14
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | am 06100d01: Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| | |\ \ \ \ \ \ \
| | | * | | | | | | Disable clipping on the base surfaceChris Craik2012-06-012-11/+14
* | | | | | | | | | am f3e42950: am 6b850721: Fixed mistake in how label was being mistakenly set...George Mount2012-06-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 6b850721: Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
* | | | | | | | | | am c6990706: am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| | |/ / / / / / /
* | | | | | | | | am c40f87a1: am b5d3edac: Merge "Invalidate webview content on setBackgroundC...Chris Craik2012-05-311-0/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am b5d3edac: Merge "Invalidate webview content on setBackgroundColor" into jb...Chris Craik2012-05-311-0/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Invalidate webview content on setBackgroundColor" into jb-devChris Craik2012-05-311-0/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Invalidate webview content on setBackgroundColorChris Craik2012-05-311-0/+7
| | | | |_|_|/ / / | | | |/| | | | |
* | | | | | | | | am 9af7514f: am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /