summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* am 5ce4bd8d: am db590796: Merge "Minimize tearing for fixed element in ↵Teng-Hui Zhu2012-05-306-12/+28
|\ | | | | | | | | | | | | single surface mode" into jb-dev * commit '5ce4bd8decc0c23f3727397652e4b9d9193f6d3e': Minimize tearing for fixed element in single surface mode
| * Merge "Minimize tearing for fixed element in single surface mode" into jb-devTeng-Hui Zhu2012-05-306-12/+28
| |\
| | * Minimize tearing for fixed element in single surface modeTeng-Hui Zhu2012-05-306-12/+28
| | | | | | | | | | | | | | | | | | bug:5683630 Change-Id: I43f738f2649a79b4ad7865ed27375c07195fa9b9
* | | am 08241ef7: am e4d0c197: Merge "Draw entire layer tree in capturePicture()" ↵Chris Craik2012-05-302-2/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-dev * commit '08241ef71160ccc36c2e104ad8c1092dc293a9d3': Draw entire layer tree in capturePicture()
| * | Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-302-2/+11
| |\ \
| | * | Draw entire layer tree in capturePicture()Chris Craik2012-05-302-2/+11
| | |/ | | | | | | | | | | | | | | | | | | Also fixes matrix initialization in BaseLayerAndroid::getLocalTransform() bug:6389297 Change-Id: I6a3df3de129aa263986c5082614d8d76bc7408f7
* | | am c83120b4: am 658c3ec9: Merge "Consider frame offset for text snap ↵George Mount2012-05-302-19/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | rectangle." into jb-dev * commit 'c83120b4d089eed50a8c819256f065457529b862': Consider frame offset for text snap rectangle.
| * | Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
| |\ \
| | * | Consider frame offset for text snap rectangle.George Mount2012-05-292-19/+13
| | |/ | | | | | | | | | | | | | | | Bug 6556824 Change-Id: I2c39bf3d7461cfe21e33fd18ab798ca824cbdd96
* | | am 1d51221c: am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" ↵John Reck2012-05-293-2/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-dev * commit '1d51221cb2f00354a8d78776caaaa04347e9b61b': Don't use setupPaintFill for drawBitmap
| * | Merge "Don't use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
| |\ \
| | * | Don't use setupPaintFill for drawBitmapJohn Reck2012-05-293-2/+15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6505013 When drawing a bitmap, don't use setupPaintFill(). The reason is that setupPaintFill will use the fillColor to influence the alpha set on the SkPaint. However, that fillColor does not apply to the bitmap, and can have the result of applying the wrong alpha (as the alpha set is fillColor alpha * graphicsContext's alpha). Instead, set the alpha on the paint directly and use setupPaintCommon Change-Id: Ib8d7ef494593a2896e6e3ed03c00d8d4d4b7232a
* | | am 07e81ac8: am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '07e81ac8f155f768bd769b95efd758c6acb9d6a6': Fix for wrong positioning
| * | Fix for wrong positioningNicolas Roard2012-05-291-1/+1
| | | | | | | | | | | | | | | bug:6560078 Change-Id: I1ef7b3e6398f1cb9a80027a6917d9a557deb8c6f
* | | am 9f927208: am bc9eaa14: Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
|\ \ \ | |/ / | | | | | | | | | * commit '9f9272088f0222ce4535b8b638036e5ec3340e74': Reduce UI-thread computation
| * | Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
| |\ \
| | * | Reduce UI-thread computationChris Craik2012-05-257-40/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current clip covers the entire view, we don't have to calculate framework invals from swapping layers - we already draw them immediately. bug:6530473 Change-Id: I4b639e06781371e37c246f3220b79f28e7d95649
* | | | am e0c18376: am 6184a1df: Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e0c1837650762f7aaeb5be275fbaa93ded0ecd02': Disable copyScrollPosition for iframes
| * | | Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 6557664 For now simply disable copyScrollPosition for iframes. They may jitter slightly if webkit does a tree sync while scrolling, but the copying isn't trivial due to the nature of iframe scrolling Change-Id: I816fe96b452794b3289c3a522a11447c057e9c5e
* | | am eeb490ff: am 86ba0734: Compute scroll limits correctlyJohn Reck2012-05-293-17/+31
|\ \ \ | |/ / | | | | | | | | | * commit 'eeb490ff95e8b9fd90f186ab2ec170d02af896dd': Compute scroll limits correctly
| * | Compute scroll limits correctlyJohn Reck2012-05-253-17/+31
| | | | | | | | | | | | | | | | | | Bug: 6563848 Change-Id: I167487fab64c97b6c4ec7f1b14639415ce15e26f
* | | Merge "Make sure we don't use GPS when not required"Steve Block2012-05-291-0/+1
|\ \ \
| * | | Make sure we don't use GPS when not requiredSteve Block2012-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that we disable the GPS if a single page makes requests with enableHighAccuracy enabled, followed by requests with enableHighAccuracy disabled. Bug: 6511338 Change-Id: I4d67b84d5eed04822c05f70c2dce47a5a696c2fc
* | | | am 05506155: am 5ac11a7e: Merge "Fix a browser crash related to HTML5 ↵Teng-Hui Zhu2012-05-251-9/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | video." into jb-dev * commit '05506155eaa4e4528ea3d2b05e6953677c6d3205': Fix a browser crash related to HTML5 video.
| * | | Merge "Fix a browser crash related to HTML5 video." into jb-devTeng-Hui Zhu2012-05-251-9/+0
| |\ \ \
| | * | | 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
| * | | | 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
| * | | | | 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
| * | | | | 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
| * | | | 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
| * | | | 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
| * | | | 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
| * | | 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
| * | | 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
* | | | 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
| * | | Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-246-13/+15
| |\ \ \