summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | Fix a browser crash related to HTML5 video.Teng-Hui Zhu2012-05-251-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in fact take out the previous change based on the assumption that we only support fullscreen. https://android-git.corp.google.com/g/#/c/91062/ The reason we don't need this early return is we use user gesture to block the play() call which is not from user interaction. bug:6555273 Change-Id: I7012a81138d03a4d95fa976bac12cce833996def
* | | | | | | | | | | am a0993e9d: am 9f135757: Merge "Copy scroll position for scrolling layer" ↵John Reck2012-05-251-21/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'a0993e9dadfe2ffaa000aa96d160000c5645fa82': Copy scroll position for scrolling layer
| * | | | | | | | | | am 9f135757: Merge "Copy scroll position for scrolling layer" into jb-devJohn Reck2012-05-251-21/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f135757e8b023aebf41ae81221f66abc1461fb4': Copy scroll position for scrolling layer
| | * | | | | | | | | Merge "Copy scroll position for scrolling layer" into jb-devJohn Reck2012-05-251-21/+15
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Copy scroll position for scrolling layerJohn Reck2012-05-251-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6557664 Change-Id: I32aa77b6fd408dc4f1097513cbb1211184a93885
* | | | | | | | | | | | am 70752fce: am 38ea37b8: Merge "Use newest available SurfaceBacking scale ↵Chris Craik2012-05-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when counting texture usage" into jb-dev * commit '70752fcef6c92ef66935d98373441aed985fafe2': Use newest available SurfaceBacking scale when counting texture usage
| * | | | | | | | | | | am 38ea37b8: Merge "Use newest available SurfaceBacking scale when counting ↵Chris Craik2012-05-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture usage" into jb-dev * commit '38ea37b8e24510a49a3eded4a6f4863584479fec': Use newest available SurfaceBacking scale when counting texture usage
| | * | | | | | | | | | Merge "Use newest available SurfaceBacking scale when counting texture ↵Chris Craik2012-05-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usage" into jb-dev
| | | * | | | | | | | | | Use newest available SurfaceBacking scale when counting texture usageChris Craik2012-05-251-2/+2
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using m_scale would mean that while zooming out, the clipped area would get larger, but the scale would stay the same. bug:6561401 Change-Id: I0806ecb8f565c4d227a2be2b7a27a0af6aff7b46
* | | | | | | | | | | | am e8a7affb: am 2cb64bfb: Merge "Better support for HTML5 audio loop" into ↵Teng-Hui Zhu2012-05-252-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'e8a7affb3657241b523eb7006333216a62b97d28': Better support for HTML5 audio loop
| * | | | | | | | | | | am 2cb64bfb: Merge "Better support for HTML5 audio loop" into jb-devTeng-Hui Zhu2012-05-252-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2cb64bfb5132a7e48f6f425eccaf1db079b91ced': Better support for HTML5 audio loop
| | * | | | | | | | | | Merge "Better support for HTML5 audio loop" into jb-devTeng-Hui Zhu2012-05-252-0/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Better support for HTML5 audio loopTeng-Hui Zhu2012-05-242-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5461143 frameworks change: https://android-git.corp.google.com/g/#/c/193751/ Change-Id: I691a8aa7eb2a7fc196358a3ab2929075bd4a8a8b
* | | | | | | | | | | | am 45484edf: am 385ef015: Merge "Compute draw transforms only for ↵Chris Craik2012-05-255-43/+63
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | / / / / / / | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new/dynamically transformed layers" into jb-dev * commit '45484edf04e18c45ba8bc11f5d00c9f455417a34': Compute draw transforms only for new/dynamically transformed layers
| * | | | | | | | | | am 385ef015: Merge "Compute draw transforms only for new/dynamically ↵Chris Craik2012-05-255-43/+63
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transformed layers" into jb-dev * commit '385ef015bf9d84a940d65586b9f70292f6b6fb63': Compute draw transforms only for new/dynamically transformed layers
| | * | | | | | | | | Merge "Compute draw transforms only for new/dynamically transformed layers" ↵Chris Craik2012-05-255-43/+63
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | into jb-dev
| | | * | | | | | | | Compute draw transforms only for new/dynamically transformed layersChris Craik2012-05-245-43/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, hundreds of layers could take 4+ ms to update transforms. Now, only those that are fixed, have animations, or are scrollable calculate transforms. bug:6530473 Change-Id: Ic9b14b76190c5bd0e5a405914a624d92b7ca7980
* | | | | | | | | | | am 06d698b1: am 917ab176: Support content detection metatagsJohn Reck2012-05-246-2/+49
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '06d698b1f053f42cf2a6041fd1298f207d80a01e': Support content detection metatags
| * | | | | | | | | | am 917ab176: Support content detection metatagsJohn Reck2012-05-246-2/+49
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '917ab176521f67983bd1c7cdb99f55ce8fc412f5': Support content detection metatags
| | * | | | | | | | | Support content detection metatagsJohn Reck2012-05-246-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6558360 Change-Id: Idf02946306119755e3284b74f20ea5566f68d8ee
* | | | | | | | | | | am 8959907b: am 91f41286: Support skipping a touch stream due to lack of ↵John Reck2012-05-249-7/+60
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handlers * commit '8959907b97e269d7183d4817f295234718b41365': Support skipping a touch stream due to lack of handlers
| * | | | | | | | | | am 91f41286: Support skipping a touch stream due to lack of handlersJohn Reck2012-05-249-7/+60
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91f41286e33b387859e4841711f3054bcf75c748': Support skipping a touch stream due to lack of handlers
| | * | | | | | | | | Support skipping a touch stream due to lack of handlersJohn Reck2012-05-249-7/+60
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6317798 Change-Id: I8c4cd3bf4c538aff202ed0e3f84982fb112936a1
* | | | | | | | | | am fa4bf4e2: am e5d2bf33: Merge "Fix memory leak" into jb-devNicolas Roard2012-05-241-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa4bf4e284c5baec48b2f8721efd43dc4ac4d646': Fix memory leak
| * | | | | | | | | am e5d2bf33: Merge "Fix memory leak" into jb-devNicolas Roard2012-05-241-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5d2bf33ff91f1c00fb2ecd73879ba8d3a8298a7': Fix memory leak
| | * | | | | | | | Merge "Fix memory leak" into jb-devNicolas Roard2012-05-241-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix memory leakNicolas Roard2012-05-241-2/+2
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6535726 Change-Id: Id944448a9dbafa951fd3c7eab0f248380d0a5314
* | | | | | | | | | am 858defca: am ac4c6f05: Merge "Fix global buffer overlow error reported by ↵Selim Gurun2012-05-241-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASAN" into jb-dev * commit '858defca5ea993504cb1f32681d2681f6b718a67': Fix global buffer overlow error reported by ASAN
| * | | | | | | | | am ac4c6f05: Merge "Fix global buffer overlow error reported by ASAN" into ↵Selim Gurun2012-05-241-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'ac4c6f05bf12b5641c7bfe0717d2ecf22718e9fb': Fix global buffer overlow error reported by ASAN
| | * | | | | | | | Merge "Fix global buffer overlow error reported by ASAN" into jb-devSelim Gurun2012-05-241-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix global buffer overlow error reported by ASANSelim Gurun2012-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6545539 Fix overflow in char* to string conversion. Change-Id: If5f2d1eae8f50ee5b61442e9a71b38c9fc74db46
* | | | | | | | | | Merge "Modify makefile for building for ASAN"Selim Gurun2012-05-241-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Modify makefile for building for ASANSelim Gurun2012-05-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaeca0893acb9df9c919f3b72c03ff99745ab4e82
* | | | | | | | | | | am fe5bfa1b: am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-246-13/+15
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe5bfa1befcb0e865d69d497280db9b16b361da8': Move scrollOffset into Layer class
| * | | | | | | | | | am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-246-13/+15
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c52999fb17b49c672908e36aabda61abf63fe8f': Move scrollOffset into Layer class
| | * | | | | | | | | Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-246-13/+15
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Move scrollOffset into Layer classChris Craik2012-05-236-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layer can now use the offset to paint, resulting in correct translates for overflow:scroll layers in the Layer::draw() path. bug:6548000 Change-Id: I1dfb88b15491e72e6c3841ce2953e114124e40fd
* | | | | | | | | | | | am 284e9fee: am c8d518ba: Merge "properly convert data from utf-16 to utf-8 ↵Victoria Lease2012-05-241-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | / / / / / / / / | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in LoadData()" into jb-dev * commit '284e9feef00d472eef6a2eb5757c85df23dd921a': properly convert data from utf-16 to utf-8 in LoadData()
| * | | | | | | | | | am c8d518ba: Merge "properly convert data from utf-16 to utf-8 in ↵Victoria Lease2012-05-241-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LoadData()" into jb-dev * commit 'c8d518ba99824a76fa842162ea8284a2261fa4a0': properly convert data from utf-16 to utf-8 in LoadData()
| | * | | | | | | | | Merge "properly convert data from utf-16 to utf-8 in LoadData()" into jb-devVictoria Lease2012-05-241-3/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | properly convert data from utf-16 to utf-8 in LoadData()Victoria Lease2012-05-241-3/+3
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetStringUTFChars() was turning U+1F382 into garbage data: 0xED 0xA0 0xBC 0xED 0xBE 0x82. WTF::String's UChar* constructor converts this codepoint into proper UTF-8: 0xF0 0x9F 0x8E 0x82. Bug: 5961185 Change-Id: Ie8f1ef9b633bda5f7e93570eab9118b35911e93e
* | | | | | | | | | | am f285f8be: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f285f8bed292bdc595396e8211705e867e015116': Fix crash
| | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | / / / | | | | |_|_|_|_|/ / / | | | |/| | | | | | | Change-Id: I5f7ce09ea5b749781e19523add60776816b29342
| | | * | | | | | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Fix crashNicolas Roard2012-05-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6537803 Change-Id: Ie0bb6e64644fd82c0ed6cf92c592c434f67fdc0d
| | | * | | | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | am 9bada0c1: am 39ba1a3a: Merge "Don\'t send selection info to WebView for ↵George Mount2012-05-241-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unrendered selections." into jb-dev * commit '9bada0c1014db839ba690474105c2126c11ad317': Don't send selection info to WebView for unrendered selections.
| * | | | | | | | | | | am 39ba1a3a: Merge "Don\'t send selection info to WebView for unrendered ↵George Mount2012-05-241-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selections." into jb-dev * commit '39ba1a3a160e41f7e3efc87365c14142f02a341a': Don't send selection info to WebView for unrendered selections.
| | * | | | | | | | | | Merge "Don't send selection info to WebView for unrendered selections." into ↵George Mount2012-05-241-1/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | jb-dev
generated by cgit v1.1 at 2025-09-15 01:49:18 +0000