summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-49/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | changes. Includes patch which fixes merge issue"
| * | | | | | | | | | Fix hardcoded font path. Allow adding new font path thru Skia changes.Billy Hewlett2012-06-071-49/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes patch which fixes merge issue Bug: 6609231 Change-Id: Ib802981fd077fb733a224addfd5aad3046b96cca
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6508448 This is to make sure webkit usage of scoped refptrs are compatible with chromium changes, see bug for more details. Change-Id: I24e3615ba961ba928d1074d54ea0bfe2d051519a
* | | | | | | | | | | | Merge "Fixed flipped selection handles."George Mount2012-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed flipped selection handles.George Mount2012-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6623406 Change-Id: Ib99d308fe97d245bc55ffb2557319efffb6e6e4f
* | | | | | | | | | | | | Merge "Fix build warning."George Mount2012-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix build warning.George Mount2012-06-061-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6622975 Change-Id: I375cdb22623317372236de9d05e886f4e422b256
* | | | | | | | | | | | Merge "Revert "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-15/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes. Bug: 6609231""
| * | | | | | | | | | | | Revert "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes. Bug: 6609231" This reverts commit ca140956b75684db0cb9609af79b8e8956ae770a
* | | | | | | | | | | | | Merge "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-47/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | changes. Bug: 6609231"
| * | | | | | | | | | | | Fix hardcoded font path. Allow adding new font path thru Skia changes.Billy Hewlett2012-06-041-47/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6609231 Change-Id: I3ecaf2bc8c560588f38f4c3a49ede7fadd1ee81c
* | | | | | | | | | | | | am f1274677: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | | * commit 'f1274677aa2dbbed2e81a7fdeedf8fe6b6a9f78c': Reduce base layer false clip size to avoid rounding issues
| * | | | | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I0d9f1959ea85b1e9b831773f9fc91a65721528f3
| | * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6605853 Change-Id: I65583e61197452ac70c5adf5f967182f0fd7578a
| | | * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6614784 Change-Id: Ifb6ef42fc4df4b163f29c9777c79f42b60a65f4e
* | | | | | | | | | | | | | am 3b9c97dd: am 7da43ef8: Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b9c97dddec1d7be0c22d97cf2bcd224e2c4f23e': Fix fake bold for fallback fonts.
| * | | | | | | | | | | | | am 7da43ef8: Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7da43ef8daf722f6d10dc4c452e1dc7be11b4a9f': Fix fake bold for fallback fonts.
| | * | | | | | | | | | | | 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
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With no knowledge of the actual SkTypeface used to render text before render-time, the best we can do is turn fake bold on for all text and simply ignore it at render-time if the SkTypeface's style is bold. Also the complex FontPlatformData hashing mechanism needed to account for fake styles, as the versions of FontPlatformData with fake styles enabled are otherwise indistinguishable from the normal style version Bug: 6522642 Change-Id: Ic0e9f1bbd8cae9fdd3a6d1d015bb9224c8be545c
* | | | | | | | | | | | | | am 16a85ada: am d3fa9c80: Reduce base layer false clip size to avoid ↵Chris Craik2012-06-052-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rounding issues * commit '16a85ada902e896fca5d91e258d0ab0f2f4c0250': Reduce base layer false clip size to avoid rounding issues
| * | | | | | | | | | | | | am d3fa9c80: Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3fa9c806c1d877caa561206c38047ad905ca668': Reduce base layer false clip size to avoid rounding issues
| | * | | | | | | | | | | | Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6605853 Change-Id: I65583e61197452ac70c5adf5f967182f0fd7578a
* | | | | | | | | | | | | am a70a7851: am 988183e3: Size change on the base surface invalidates the ↵Chris Craik2012-06-051-8/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | / / / / / / / / / | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | larger of the new/old dimensions * commit 'a70a7851d9c5daeef242cb9e6641dfcc449324c3': Size change on the base surface invalidates the larger of the new/old dimensions
| * | | | | | | | | | | am 988183e3: Size change on the base surface invalidates the larger of the ↵Chris Craik2012-06-041-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new/old dimensions * commit '988183e308148947b034b108c552e719eaff74fb': Size change on the base surface invalidates the larger of the new/old dimensions
| | * | | | | | | | | | Size change on the base surface invalidates the larger of the new/old dimensionsChris Craik2012-06-041-8/+18
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where tiles outside the new bounds weren't invalidated, as the layer shrank in one dimension. bug:6609350 Change-Id: I1f6715670654c9e6211dbec71875aa2ea11cd8f8
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6557816 Change text selection to modify only the base or extent, not both points of the selection. Framework Change: I355b21e9062b5d364cfb278fda239a4ecdff16d1 Change-Id: I9a08633160eeb14d5c45246c6128aa02c1642e8d
* | | | | | | | | | | | 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
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6557816 This is a step in preparation to fix text area selection. It moves selection from left/right to base/extent. left/right can cause problems when dragging cursors -- it is sometimes difficult to tell which cursor should be dragged, the left or right, but we can always keep the base/extent constant. Framework Change: I2f9b963e93bb1ab86a9b26518fca52449b56d5d9 Change-Id: I5609d07ea2ee67fc08d15cfcad31f49302f33297
* | | | | | | | | | am c2973319: am 06100d01: Merge "Disable clipping on the base surface" into ↵Chris Craik2012-06-022-11/+14
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'c29733197c3c7e09fb276016a8b492412ca9e64f': Disable clipping on the base surface
| * | | | | | | | am 06100d01: Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '06100d01966af4c0332fd964d9deb20f052c308d': Disable clipping on the base surface
| | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base surface can expand dynamically (see BaseLayerAndroid::updatePosition) to fill the viewport, so disable clipping on it. bug:6593707 Change-Id: I3afafb28fbe95d3162c76f8e835932577ded65ce
* | | | | | | | | | am f3e42950: am 6b850721: Fixed mistake in how label was being mistakenly ↵George Mount2012-06-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set into name. * commit 'f3e429507eba1a13e9afaf436e240fd81797c646': Fixed mistake in how label was being mistakenly set into name.
| * | | | | | | | | am 6b850721: Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b850721064920ae1ddb114964c5c2bb4a745532': Fixed mistake in how label was being mistakenly set into name.
| | * | | | | | | | Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6594983 Change-Id: I8adf636345e5d5284e372e28176c31c7e937334d
* | | | | | | | | | am c6990706: am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c69907062387aaedf35962337b254c01893d398b': Fix document.createTouchList crash.
| * | | | | | | | | am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '678de4acf72e6fd4c6fb9426d2c69445acc18135': Fix document.createTouchList crash.
| | * | | | | | | | Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick of WebKit r119158. Note the layout test is tweaked slighly from upstream to make it happy in our older webkit snapshot. See: http://trac.webkit.org/changeset/119158 Bug: 6578213 Change-Id: Id6cc23938b5139cf0416e3d4c6e7ba227b1b6a0c
* | | | | | | | | am c40f87a1: am b5d3edac: Merge "Invalidate webview content on ↵Chris Craik2012-05-311-0/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setBackgroundColor" into jb-dev * commit 'c40f87a1970b5377976087f2ffb4f0c621d39fd5': Invalidate webview content on setBackgroundColor
| * | | | | | | | am b5d3edac: Merge "Invalidate webview content on setBackgroundColor" into ↵Chris Craik2012-05-311-0/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'b5d3edac71ca2c54cbf9ce5bf42cc7727216ac09': Invalidate webview content on setBackgroundColor
| | * | | | | | | Merge "Invalidate webview content on setBackgroundColor" into jb-devChris Craik2012-05-311-0/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Invalidate webview content on setBackgroundColorChris Craik2012-05-311-0/+7
| | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6593154 Change-Id: Ic9438f758c7c67d0a2e0579dbc53dcdf8dd109cd
* | | | | | | | | am 9af7514f: am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9af7514f84d41c3aa4add011ef0ffe5af04e7143': Don't allow merging within an animated layer
generated by cgit v1.1 at 2025-09-14 20:44:13 +0000