summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Null check" into jb-mr1-devJohn Reck2012-08-131-1/+1
|\
| * Null checkJohn Reck2012-08-131-1/+1
| | | | | | | | | | | | Bug: 6975836 Change-Id: I085e2099d016730ba1fdcce71e0452b2026c9617
* | Merge "Improve in-canvas pure color checking" into jb-mr1-devChris Craik2012-08-132-35/+49
|\ \ | |/ |/|
| * Improve in-canvas pure color checkingChris Craik2012-08-102-35/+49
| | | | | | | | | | | | | | Fast path for same-color rect drawing in InstrumentedPlatformCanvas Also minimize unnecessary clipping recording-side. Change-Id: I8e9ebcfce8d137ca0b27d17c42c5045a0d3b3a36
* | Merge "Clear mOperationState when calling popState" into jb-mr1-devJohn Reck2012-08-102-7/+14
|\ \ | |/ |/|
| * Clear mOperationState when calling popStateJohn Reck2012-08-102-7/+14
| | | | | | | | Change-Id: I96df41fc2b8e040e0e98b991c71b1d9bda40788e
* | Merge "Paint with requested size instead of layer size" into jb-mr1-devChris Craik2012-08-101-1/+1
|\ \ | |/ |/|
| * Paint with requested size instead of layer sizeChris Craik2012-08-091-1/+1
| | | | | | | | | | bug:6925835 Change-Id: Idaf37156cd0c42f59151dc2dca95acfef542d312
* | Merge "Clip out opaque regions to avoid double painting" into jb-mr1-devChris Craik2012-08-093-4/+154
|\ \
| * | Clip out opaque regions to avoid double paintingChris Craik2012-08-083-4/+154
| |/ | | | | | | | | | | | | | | | | | | | | Implementation is similar to PicturePile::drawWithClipRecursive. When an opaque paint operation (currently either a DrawBitmapRect/Pattern or FillRect) will cover up a section of the output, avoid painting things underneath it. Track this covered region by recursing backwards through paint operations, and clipping out opaque areas when operations beneath them paint. Change-Id: Id3ae7508aada27f90246feb689d9e7f53f03ae32
* | Fix memory leakJohn Reck2012-08-081-0/+6
|/ | | | | | | | | | | | | | Bug: 6952980 GraphicsContext::createOffscreenContext creates an instance of both PlatformGraphicsSkia and GraphicsContext for ImageBuffer. However, ImageBuffer will only call delete on the GraphicsContext. In normal GC usage, the PlatformGraphicsContext's lifecycle is longer than the GCs, and is cleaned up by itself. This will result in leaking the PlatformGraphicsSkia context, though. We need to make sure to call delete on the PlatformGraphicsSkia context if we were initialized with the deleteUs() flag, which is used to indicate just this scenario. Change-Id: I73aa623182a039bd75d378d198cc3bd2d4d185ef
* Merge "Reset cached opacity on shader swap" into jb-mr1-devChris Craik2012-08-071-0/+1
|\
| * Reset cached opacity on shader swapChris Craik2012-08-071-0/+1
| | | | | | | | | | | | | | | | | | bug:6947623 Multiple shaders share the opacity variable, so reset the cache when swapping programs. Change-Id: I752575d6089077aa8034c171c5c016e5e4e80606
* | Add extra null checkJohn Reck2012-08-071-0/+2
| | | | | | | | | | | | Bug: 6789548 Change-Id: I2c6de52862f71881fbb885680a9f917d87d293df
* | Remove usages of getCanvasJohn Reck2012-08-0631-161/+162
| | | | | | | | | | | | Everything goes through either PlatformGraphicsContext or recordingCanvas() Change-Id: I375a4294d2e8d4b467b70c6b8a7f0b96f402f252
* | am dd5962d2: am 47387cc7: Merge "Fix browser rendering issue: pure color ↵John Reck2012-08-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | tiles are rendered black" * commit 'dd5962d2534b8c3cc215492c8dcf463e923f73c2': Fix browser rendering issue: pure color tiles are rendered black
| * \ am 47387cc7: Merge "Fix browser rendering issue: pure color tiles are ↵John Reck2012-08-021-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | rendered black" * commit '47387cc7716048dcea1cc5f9bf37da65d38e10be': Fix browser rendering issue: pure color tiles are rendered black
| | * | Fix browser rendering issue: pure color tiles are rendered blackYuyang Du2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The “pure color tile” optimization finds the pure-color tiles and then draws the tiles simply with the color (otherwise the texture). But the RGBA color pointer type is char, which may overflow when the value is larger than 127. In such case, the tiles in question are rendered black, because of the wrong color. This bug is fixed by defining the pointer as unsigned char. Change-Id: I5c7214423fa6961e707bde72f0e18c610374745d Author: Yuyang Du <yuyang.du@intel.com> Signed-off-by: Yuyang Du <yuyang.du@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | DO NOT MERGE. Allow numeric entry fields to have placeholder text.George Mount2012-08-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6712551 Change-Id: I0e43bb223dc2646d6d78f6135f502b75066e6449
* | | | Merge "Tweak shadow settings" into jb-mr1-devJohn Reck2012-08-011-3/+3
|\ \ \ \
| * | | | Tweak shadow settingsJohn Reck2012-08-011-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I88dff91a9840c4705c9153cf03d3c6951fcee02a
* | | | | Fix build by adding missing #include.Elliott Hughes2012-08-011-0/+1
|/ / / / | | | | | | | | | | | | Change-Id: I9796a80ba5b29b4b21fa96245ec350efb44a1846
* | | | Optimize recompute bounds checksNicolas Roard2012-08-012-16/+44
| | | | | | | | | | | | | | | | Change-Id: I7819ec6a86bf8a0ec9e9033907b68a4aafa1cf22
* | | | Fix PicturePile size adjust pathJohn Reck2012-08-011-7/+23
| |_|/ |/| | | | | | | | Change-Id: I372248211ce83a6c4b2a9369df9804388b7a98ef
* | | Memory cleanupJohn Reck2012-07-312-53/+61
| | | | | | | | | | | | | | | | | | Save 24 bytes per GraphicsOperation, yay! Change-Id: I6719836b376ffeb99657a882a03d60d172d76705
* | | Switch GraphicsOperation to LinearAllocatorJohn Reck2012-07-319-94/+199
| | | | | | | | | | | | Change-Id: I9afb489c55a7acfdc35cfe8655d46ce47923b3df
* | | Don't use SkPicture for DrawText recordingJohn Reck2012-07-279-124/+276
| | | | | | | | | | | | Change-Id: I5b6872bc37eefded7decae767fc39f1cef858dac
* | | Merge "DO NOT MERGE Push everything into an R-Tree" into jb-mr1-devJohn Reck2012-07-2710-541/+233
|\ \ \
| * | | DO NOT MERGE Push everything into an R-TreeJohn Reck2012-07-2710-541/+233
| | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from master Change-Id: I0ef32777f33104d440459d9d4d3c0d61f75a11a2
* | | | Fix background tiles drawingChris Craik2012-07-272-3/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug:6875992 Initialize the InstrumentedPlatformCanvas with the correct background color so that if no painting is done, the background color is returned as the pure color. Change-Id: Ibe928a4e158f0a4302e0996eca88c3e8b1f1b666
* | | am f35e08fe: am 0e8bb600: Null check to fix crashBart Sears2012-07-241-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'f35e08fefff71bb9b84b679f8d13cf57c6e1d756': Null check to fix crash
| * | am 0e8bb600: Null check to fix crashBart Sears2012-07-241-1/+3
| |\ \ | | |/ | |/| | | | | | | * commit '0e8bb60087a019d104b6eb4aa8abd11bd91b16c4': Null check to fix crash
| | * Null check to fix crashBart Sears2012-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | Need to make sure that img is not zero. bug: 6864545 Change-Id: I2a2c5440347681b462abaa5ac9101ddb6137c8c4
* | | Merge "Support autoplay attribute for media element, with optional gesture ↵Teng-Hui Zhu2012-07-242-1/+11
|\ \ \ | | | | | | | | | | | | requirement."
| * | | Support autoplay attribute for media element, with optional gesture requirement.Teng-Hui Zhu2012-07-242-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | bug:6806306 Change-Id: I09a7494278be5631d64d125390559058682386d1
* | | | Merge "Fix bounds not being correctly propagated..."Nicolas Roard2012-07-241-4/+11
|\ \ \ \
| * | | | Fix bounds not being correctly propagated...Nicolas Roard2012-07-241-4/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I81421e45e07eddc4153996797cd9bddda9c2b8c7
* | | | | Merge "Revert "Crash if stack is corrupted""Chris Craik2012-07-241-3/+1
|\ \ \ \ \
| * | | | | Revert "Crash if stack is corrupted"Chris Craik2012-07-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5367327 bug:6656642 This reverts commit 874e5fbe3113052b0e3b7068d4b8df89bdeb4579 Change-Id: I0fd636bd93c47e9e21fac2ccf1996048823e893a
* | | | | | Merge "Don't attach empty PicturePile content to layer"Chris Craik2012-07-231-1/+2
|\ \ \ \ \ \
| * | | | | | Don't attach empty PicturePile content to layerChris Craik2012-07-231-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a frequent warning that was occurring due to empty-content layers being painted in merged layers: "Warning: painting PicturePile without content!" Change-Id: I71dbc3cdf1adbbcdd15c833add753cdd06cfcd4f
* | | | | | Merge "Reduce post-zoom painting delay to 100ms"Chris Craik2012-07-231-1/+1
|\ \ \ \ \ \
| * | | | | | Reduce post-zoom painting delay to 100msChris Craik2012-07-231-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ibaa44ce9c24bdf05de0963efe12d9123113b08b6
* | | | | | Implement missing recording drawsJohn Reck2012-07-202-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15a9c63d7aed9f54095763499d3ffff2e17872b7
* | | | | | Merge "Fix bounds for shadows"John Reck2012-07-202-4/+26
|\ \ \ \ \ \
| * | | | | | Fix bounds for shadowsJohn Reck2012-07-202-4/+26
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I304c6e78e9e570dd4e67fa101697ca3b2f17acd7
* | | | | | Merge "add webSetting API to allow media play without user gesture"Teng-Hui Zhu2012-07-204-3/+19
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | add webSetting API to allow media play without user gestureTeng-Hui Zhu2012-07-184-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6806306 This also include partial change from webkit. http://trac.webkit.org/changeset/91232 Framework change: https://android-git.corp.google.com/g/#/c/208569/ Change-Id: I1a843472c0ce3b01bcad3b7c3c12c93702f2970c
* | | | | SurfaceBackings are always zoomable once zoomableChris Craik2012-07-193-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously toggling hasText for the content of the SurfaceBacking was enough to cause it to change scale entirely each time the value was changed. Now the allowZoom flag is sticky to avoid unnecessary full-SurfaceBacking repaints. Additionally, changes from allowZoom true->false will not trigger delay. Change-Id: Ie6a13850f86d21f5a12a184c08b940aa2156ef07
* | | | | Merge "Use canvas-based pure color check"Chris Craik2012-07-196-14/+333
|\ \ \ \ \