summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "DO NOT MERGE Text locale compatibility shim" into jb-mr1-devVictoria Lease2012-08-203-91/+142
|\
| * DO NOT MERGE Text locale compatibility shimBilly Hewlett2012-08-203-91/+142
| | | | | | | | | | | | | | | | | | Cherry-pick I2a69f2834ca50c37302dcd4816edb630b1208a41 from master. This change allows WebView to continue to function as before, displaying text using the system default fallback font chain. Change-Id: Ibcb8924d270cc602295158684bd700cfcbb1ec46
* | Fix opaque operation area calculationChris Craik2012-08-202-18/+25
|/ | | | | | | | bug:7003352 Correctly handle state pushing/manipulation, shaders, and transfer mode. Change-Id: I9f6591711b15ff99a182fc9956f7ef389320e9c3
* Merge "Support partial invals on layers" into jb-mr1-devJohn Reck2012-08-174-59/+39
|\
| * Support partial invals on layersJohn Reck2012-08-174-59/+39
| | | | | | | | Change-Id: Iab18e8b5e2f0e37c380c8a15e51255121c3b1966
* | Merge "Early return from layer painting when fully clipped" into jb-mr1-devChris Craik2012-08-171-7/+8
|\ \ | |/ |/|
| * Early return from layer painting when fully clippedChris Craik2012-08-161-7/+8
| | | | | | | | | | | | Fixes logspam due to merged layers unnecessarily painting when fully clipped. Change-Id: I0f2f1b851c9386dcebda58bf844fd68073338e1c
* | Fix SIGBUG due to misalignmentJohn Reck2012-08-161-3/+3
| | | | | | | | | | | | | | Bug: 7003956 Don't pack data Change-Id: I659a8b4cbf47ece9af16532949466f3fe2f6e61b
* | Merge "Increase max texture count to accommodate large screens" into jb-mr1-devChris Craik2012-08-161-5/+5
|\ \
| * | Increase max texture count to accommodate large screensChris Craik2012-08-161-5/+5
| |/ | | | | | | | | bug:6968485 Change-Id: I8691d34fc5d4da1d03f31fd45c2d6d6abc39c53b
* | Merge "Memory allocation changes" into jb-mr1-devJohn Reck2012-08-166-80/+125
|\ \ | |/ |/|
| * Memory allocation changesJohn Reck2012-08-166-80/+125
| | | | | | | | | | | | | | | | | | Move RecordingData to LinearAllocator Consolidate 4 heaps into 1 Minimize initial RAM usage Add page size growth Change-Id: I997ee6d88d0ae500ed85b9d20e6ed095069f2b04
* | Merge "Correctly handle preserve-3d layer ordering" into jb-mr1-devChris Craik2012-08-154-47/+86
|\ \ | |/ |/|
| * Correctly handle preserve-3d layer orderingChris Craik2012-08-154-47/+86
| | | | | | | | | | | | | | | | bug:6843244 Current implementation only works for HW acceleration. Change-Id: I009090132a8f3859ab9e57e609c1754f9021d4d7
* | Merge "Use content size for scroll width calculation." into jb-mr1-devGeorge Mount2012-08-151-1/+4
|\ \
| * | Use content size for scroll width calculation.George Mount2012-08-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6976140 Horizontal scrolling calculation requires use of content and not client width. Vertical scrolling uses client width because text areas support padding differently than text inputs. Change-Id: Ib105c6c185415c1784c83f7203810a3e5416a9c8
* | | Move text allocations to LinearAllocatorJohn Reck2012-08-143-17/+34
| | | | | | | | | | | | Change-Id: I3ef492679e94bdb452033ee3af3162b88d323d57
* | | Memory usage improvementsJohn Reck2012-08-142-10/+49
|/ / | | | | | | | | | | Share SkPaints between drawPosText calls Change-Id: Idf25c937a70e2969a864c829e566688b977720c0
* | 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