summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* am 08241ef7: am e4d0c197: Merge "Draw entire layer tree in capturePicture()" ↵Chris Craik2012-05-301-0/+1
|\ | | | | | | | | | | | | into jb-dev * commit '08241ef71160ccc36c2e104ad8c1092dc293a9d3': Draw entire layer tree in capturePicture()
| * Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-301-0/+1
| |\
| | * Draw entire layer tree in capturePicture()Chris Craik2012-05-301-0/+1
| | | | | | | | | | | | | | | | | | | | | Also fixes matrix initialization in BaseLayerAndroid::getLocalTransform() bug:6389297 Change-Id: I6a3df3de129aa263986c5082614d8d76bc7408f7
* | | 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 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
* | | 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-251-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-dev * commit 'e8a7affb3657241b523eb7006333216a62b97d28': Better support for HTML5 audio loop
| * | Merge "Better support for HTML5 audio loop" into jb-devTeng-Hui Zhu2012-05-251-0/+1
| |\ \ | | |/ | |/|
| | * Better support for HTML5 audio loopTeng-Hui Zhu2012-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 8959907b: am 91f41286: Support skipping a touch stream due to lack of ↵John Reck2012-05-247-0/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-247-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix memory leakNicolas Roard2012-05-241-2/+2
| |/ / | | | | | | | | | | | | bug:6535726 Change-Id: Id944448a9dbafa951fd3c7eab0f248380d0a5314
* | | am fe5bfa1b: am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-245-12/+14
|\ \ \ | |/ / | | | | | | | | | * commit 'fe5bfa1befcb0e865d69d497280db9b16b361da8': Move scrollOffset into Layer class
| * | Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-245-12/+14
| |\ \
| | * | Move scrollOffset into Layer classChris Craik2012-05-235-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 cd6a3bff: am 6f4fd96b: Merge "Don\'t set up background images if 1x1" ↵Nicolas Roard2012-05-231-4/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'cd6a3bff0abccf9f1c3c3351c6984be2c3124239': Don't set up background images if 1x1
| * | | Merge "Don't set up background images if 1x1" into jb-devNicolas Roard2012-05-231-4/+7
| |\ \ \
| | * | | Don't set up background images if 1x1Nicolas Roard2012-05-231-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this check in other places. We still need a better solution for the general case. bug:6540356 Change-Id: I3f75c62141d7b6993928927117d972d0ec224b55
* | | | | am 3b6f13bd: am 596f7241: Merge "Use Surface areas to compute tile usage" ↵Chris Craik2012-05-235-20/+30
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '3b6f13bd760fd553d10f7d31a7840d9c2da11c43': Use Surface areas to compute tile usage
| * | | | Merge "Use Surface areas to compute tile usage" into jb-devChris Craik2012-05-235-20/+30
| |\ \ \ \
| | * | | | Use Surface areas to compute tile usageChris Craik2012-05-235-20/+30
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used the surface's first layer's area, which is often incorrect in the case of significant layer merging. bug:6545187 Change-Id: Ied3e5e3cd894b145ed905f8ba83649b3c4f3b1dd
* | | | | am f942c7b1: am 21ed283c: Merge "Add tracing to interesting/potentially ↵Chris Craik2012-05-233-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | costly functions" into jb-dev * commit 'f942c7b1e00c598672ed1298d08f543eb17b702e': Add tracing to interesting/potentially costly functions
| * | | | Merge "Add tracing to interesting/potentially costly functions" into jb-devChris Craik2012-05-233-0/+5
| |\ \ \ \
| | * | | | Add tracing to interesting/potentially costly functionsChris Craik2012-05-233-0/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | bug:6530473 bug:6344165 Change-Id: I40b190036af8c021134d5ac450e3217098ba2296
* | | | | am 5557efbd: am 17f16d58: Merge "Clean up the transferQueue code and add ↵Teng-Hui Zhu2012-05-232-55/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | more detailed GL log" into jb-dev * commit '5557efbdd0cc4e7c6c4a849ae590699a68c1e2d7': Clean up the transferQueue code and add more detailed GL log
| * | | | Merge "Clean up the transferQueue code and add more detailed GL log" into jb-devTeng-Hui Zhu2012-05-232-55/+11
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Clean up the transferQueue code and add more detailed GL logTeng-Hui Zhu2012-05-232-55/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove one unnecessary parameter in blitTileFromQueue. Remove syncKHR related code in TransferQueue since that is supported by SurfaceTexture. bug:6516534 Change-Id: Iaf1f46a0f459ad8973c7465a9b8550f760115384
* | | | am 1d1eaec5: am a6645da2: Merge "Correctly handle the EGL context ↵Teng-Hui Zhu2012-05-232-24/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | recreation." into jb-dev * commit '1d1eaec558a4a4aa8a054c5bb36c9a0e5f715598': Correctly handle the EGL context recreation.
| * | | Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
| |\ \ \ | | |/ /
| | * | Correctly handle the EGL context recreation.Teng-Hui Zhu2012-05-232-24/+21
| | | | | | | | | | | | | | | | | | | | bug:6516534 Change-Id: Iaf62359803d65d3a9acb88aa224a1a5c42f8aa4c
* | | | am 344434ac: am 7f33cb9c: Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '344434ac35a7b6406e794e619f8a8a1f6a6805fb': Fix crash
| * | | Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Fix crashNicolas Roard2012-05-231-0/+2
| | |/ | | | | | | | | | | | | bug:6537803 Change-Id: Ie0bb6e64644fd82c0ed6cf92c592c434f67fdc0d
* | | am 311b8af6: am 55d60259: Merge "Don\'t use an ImageBuffer for ↵John Reck2012-05-222-1/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | scratchContext()" into jb-dev * commit '311b8af66f874fb9dfa1680c6910b9653ff41ea1': Don't use an ImageBuffer for scratchContext()
| * | Merge "Don't use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
| |\ \ | | |/ | |/|
| | * Don't use an ImageBuffer for scratchContext()John Reck2012-05-222-1/+21
| | | | | | | | | | | | | | | | | | Bug: 6509450 Change-Id: I6d952b92062e96772663824839b0229062c3a524