summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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 c6990706: am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-013-10/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'c69907062387aaedf35962337b254c01893d398b': Fix document.createTouchList crash.
| * | Fix document.createTouchList crash.Ben Murdoch2012-06-013-10/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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 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
| * Don't allow merging within an animated layerChris Craik2012-05-312-7/+12
| | | | | | | | | | | | | | Also isolates layer translation fudging so as to not affect child transforms. bug:6585341 Change-Id: If416c6fad90ee37fbe3438e01706b34e683165b7
* | am b1005282: am 150a26fa: Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
|\ \ | |/ | | | | | | * commit 'b10052827bf3e6263912013b2daaf928a63508e8': Fix animation in single surface mode
| * Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
| | | | | | | | | | | | bug:5683630 Change-Id: I4d617962a8412de884903f150799f733ea996e1c
* | 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-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