summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Crash on Orange media portal"John Reck2012-08-311-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Crash on Orange media portalAnders Edenbrandt2012-08-311-0/+6
| | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | am 76150b63: am 5423878e: Merge "Enable dynamic effect of GIF animating image...Jean-Baptiste Queru2012-08-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | am 5423878e: Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Enable dynamic effect of GIF animating images in browserbxu10X2012-08-301-0/+4
| | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | am 88c8b226: am 9b636ce4: Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 9b636ce4: Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | webkit: enable no-pic compiling optionbxu10X2012-08-141-0/+4
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Provide referer when download requested" into jb-mr1-devSelim Gurun2012-08-295-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Provide referer when download requestedSelim Gurun2012-08-295-5/+16
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | am f2b8b88d: am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Fix memory leak caused by CSSRuleList wrapperxqian62012-08-2416-38/+50
| | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-271-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Use new surface flinger API.Jeff Brown2012-08-241-2/+9
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Text around selection falls back to caret rect when not in text." into...George Mount2012-08-272-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Text around selection falls back to caret rect when not in text.George Mount2012-08-232-4/+5
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Don't track the opaque area of small drawing operationsChris Craik2012-08-241-1/+4
| |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Only use the clipping painter when painting to a bitmap.Chris Craik2012-08-231-18/+24
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Exit fast tile swap mode immediately upon SurfaceCollection swap" into...Chris Craik2012-08-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Exit fast tile swap mode immediately upon SurfaceCollection swapChris Craik2012-08-201-0/+1
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Text locale compatibility shim" into jb-mr1-devVictoria Lease2012-08-203-91/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE Text locale compatibility shimBilly Hewlett2012-08-203-91/+142
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Fix opaque operation area calculationChris Craik2012-08-202-18/+25
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Support partial invals on layers" into jb-mr1-devJohn Reck2012-08-174-59/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Support partial invals on layersJohn Reck2012-08-174-59/+39
* | | | | | | | | | | | | | | | | | | | Merge "Early return from layer painting when fully clipped" into jb-mr1-devChris Craik2012-08-171-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Early return from layer painting when fully clippedChris Craik2012-08-161-7/+8
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am e750fbf4: am b74a9cf2: Merge "host modules don\'t need LOCAL_MODULE_TAGS"Joe Onorato2012-08-171-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am b74a9cf2: Merge "host modules don\'t need LOCAL_MODULE_TAGS"Joe Onorato2012-08-161-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "host modules don't need LOCAL_MODULE_TAGS"Joe Onorato2012-08-161-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-151-2/+0
| | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Fix SIGBUG due to misalignment" into jb-mr1-devJohn Reck2012-08-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix SIGBUG due to misalignmentJohn Reck2012-08-161-3/+3
* | | | | | | | | | | | | | | | | | | am f314e0fc: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Increase max texture count to accommodate large screens" into jb-mr1-devChris Craik2012-08-161-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Increase max texture count to accommodate large screensChris Craik2012-08-161-5/+5
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Memory allocation changes" into jb-mr1-devJohn Reck2012-08-166-80/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Memory allocation changesJohn Reck2012-08-166-80/+125
* | | | | | | | | | | | | | | | | | | Merge "Correctly handle preserve-3d layer ordering" into jb-mr1-devChris Craik2012-08-154-47/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Correctly handle preserve-3d layer orderingChris Craik2012-08-154-47/+86
* | | | | | | | | | | | | | | | | | | Merge "Use content size for scroll width calculation." into jb-mr1-devGeorge Mount2012-08-151-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use content size for scroll width calculation.George Mount2012-08-141-1/+4
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Move text allocations to LinearAllocatorJohn Reck2012-08-143-17/+34
* | | | | | | | | | | | | | | | | | Memory usage improvementsJohn Reck2012-08-142-10/+49
|/ / / / / / / / / / / / / / / / /