summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| | | | | | | | | | | | | 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
* Merge "Invalidate webview content on setBackgroundColor" into jb-devChris Craik2012-05-311-0/+7
|\
| * Invalidate webview content on setBackgroundColorChris Craik2012-05-311-0/+7
| | | | | | | | | | bug:6593154 Change-Id: Ic9438f758c7c67d0a2e0579dbc53dcdf8dd109cd
* | 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
* Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
| | | | | | bug:5683630 Change-Id: I4d617962a8412de884903f150799f733ea996e1c
* Merge "Don't override X-Requested-With if it is already set" into jb-devJohn Reck2012-05-301-1/+1
|\
| * Don't override X-Requested-With if it is already setJohn Reck2012-05-301-1/+1
| | | | | | | | | | | | Bug: 6547248 Change-Id: I50490abec1ac62a94acb750182e9ae70a5a654e9
* | 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
* | | 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
* | 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
* | 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
* | Fix for wrong positioningNicolas Roard2012-05-291-1/+1
| | | | | | | | | | bug:6560078 Change-Id: I1ef7b3e6398f1cb9a80027a6917d9a557deb8c6f
* | 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
* | | 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
* | Compute scroll limits correctlyJohn Reck2012-05-253-17/+31
| | | | | | | | | | | | Bug: 6563848 Change-Id: I167487fab64c97b6c4ec7f1b14639415ce15e26f
* | 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
* | | 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
* | | | 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
* | | | 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
* | | | 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
* | | | Support content detection metatagsJohn Reck2012-05-246-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6558360 Change-Id: Idf02946306119755e3284b74f20ea5566f68d8ee
* | | | Support skipping a touch stream due to lack of handlersJohn Reck2012-05-249-7/+60
| |_|/ |/| | | | | | | | | | | | | | Bug: 6317798 Change-Id: I8c4cd3bf4c538aff202ed0e3f84982fb112936a1
* | | 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
* | | 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 "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
* | | | 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
* | | | Merge "Don't send selection info to WebView for unrendered selections." into ↵George Mount2012-05-241-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | jb-dev
| * | | | Don't send selection info to WebView for unrendered selections.George Mount2012-05-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6537569 Change-Id: Iefbb06ad9175f61b79d815c668754538febec4f5
* | | | | Merge "Don't set up background images if 1x1" into jb-devNicolas Roard2012-05-232-6/+12
|\ \ \ \ \
| * | | | | Don't set up background images if 1x1Nicolas Roard2012-05-232-6/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this check in other places. We still need a better solution for the general case. bug:6540356 Change-Id: I3f75c62141d7b6993928927117d972d0ec224b55
* | | | | 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
* | | | | 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
* | | | 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