summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* am f912aaa3: am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
|\ | | | | | | | | * commit 'f912aaa3c8084eccb0f5fcb74606063d9ce5c74b': Revert "Put canvas on a layer"
| * Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
| |\
| | * Revert "Put canvas on a layer"John Reck2011-12-132-7/+1
| | | | | | | | | | | | Bug: 5712065 This reverts commit 35e0b8dd7902e92f50ede4df2e4bad4ed581b770
* | | Merge "Removed computeCursorRings."Victoria Lease2011-12-131-3/+0
|\ \ \
| * | | Removed computeCursorRings.Victoria Lease2011-12-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | As a result of the fix for 5688027, computeCursorRings is no longer used. Change-Id: I4e7f06067608e283d327a8abc09b42de7a9b83d2
* | | | Merge "update callback mechanism, adds nativeDiscardAllTextures for ↵Chris Craik2011-12-135-24/+44
|\ \ \ \ | |/ / / |/| | | | | | | TileBenchmark tool"
| * | | update callback mechanism, adds nativeDiscardAllTextures for TileBenchmark toolChris Craik2011-12-135-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5062896 Depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/154844/ Change-Id: I8e5101fa212568837fe002b14fb9171c2f6dfe22
* | | | Merge "Removed ConstructPartRects()."Victoria Lease2011-12-121-104/+3
|\ \ \ \
| * | | | Removed ConstructPartRects().Victoria Lease2011-12-121-104/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 5688027 This function was producing incorrect bounds. WebKit's bounds are preferable. Change-Id: I2458a149bcb284b29a45972bb46e5c1cb09c0c66
* | | | | am 5f0a489e: am c52e5656: Merge "Fix ANR when hitting very large layers" ↵Nicolas Roard2011-12-121-5/+8
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '5f0a489e7a7dbb42ae725b31e34a92901c65eb0a': Fix ANR when hitting very large layers
| * | | | Merge "Fix ANR when hitting very large layers" into ics-mr1Nicolas Roard2011-12-081-5/+8
| |\ \ \ \
| | * | | | Fix ANR when hitting very large layersNicolas Roard2011-12-081-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases we have to deal with very large layers (e.g. 130k x 56k). We do clip them at draw time, but at prepare time we will generate *all* the needed BaseTile objects. Those are small, but when you have to allocated 100k of them and then iterate, it does not make things fast, and we can ANR (and sometimes recover later). bug:5466840 Change-Id: I01c64ed1014fa719b619609fd2bd24126dc9056e
* | | | | | am 397afc9c: am 2ee79460: Merge "Reset framework inval when done zooming" ↵Chris Craik2011-12-121-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | into ics-mr1 * commit '397afc9c161292e163bf2381973fced88c7123bf': Reset framework inval when done zooming
| * | | | Merge "Reset framework inval when done zooming" into ics-mr1Chris Craik2011-12-081-0/+1
| |\ \ \ \
| | * | | | Reset framework inval when done zoomingChris Craik2011-12-081-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5726709 Framework invals are not valid when zooming completes because much content outside the rect will have changed from zooming. Change-Id: I72e4509e13bf97ea90f09716699e66c1c3f9acd8
* | | | | Merge "Fix use of LOG_VERBOSE in WebHistory"Steve Block2011-12-121-18/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix use of LOG_VERBOSE in WebHistorySteve Block2011-12-121-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the debug build. See https://android-git.corp.google.com/g/#/c/150512 Change-Id: Id85c11788c2ad913f8826aa55f49f25401b7ee42
* | | | | Merge "Swap tiles when viewport changes slightly, and properly cap prepare ↵Chris Craik2011-12-093-4/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | bounds"
| * | | | | Swap tiles when viewport changes slightly, and properly cap prepare boundsChris Craik2011-12-093-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5738336 Viewport changes that overlap previous viewports will result in fast scrolling mode being activated. Change-Id: I356df0054caff19519fcf8543f96726e78918922
* | | | | | Merge "Fix the repaint inval mechanism for layers - cherry-pick from MR1"Nicolas Roard2011-12-093-1/+16
|\ \ \ \ \ \
| * | | | | | Fix the repaint inval mechanism for layers - cherry-pick from MR1Nicolas Roard2011-12-093-1/+16
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only keep the scrollable layers invalidating their entire area instead of incurring this penalty for *all* layers. Also remove unnecessary repaint when scrolling (we have the entire content on the UI side already). While the entire scrollable area will be invalidated and marked as dirty, the existing code in PaintedSurface already only look at the visible tiles of scrollable layers to consider the layer's content as being ready to display, so the real world penalty (while far from optimal) is limited. Implementing the correct approach (only invalidating what really changed on scrollable layers) would sadly be a lot more complex, as currently webkit will *not* send us the repaint invals if they are on a currently clipped area, as webkit's default behaviour to implement scrolling of such element is to repaint them anyway... bug:5721618 Change-Id: I9af240d5f42f00f9ab07710e43ef8d72dfaf8155
* | | | | | am aa816687: Merge "Prevent native crashes on client cert request" into ics-mr1Selim Gurun2011-12-092-11/+12
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | * commit 'aa81668752d33ae7a345626ab61f1ea9fc931392': Prevent native crashes on client cert request
| * | | | Merge "Prevent native crashes on client cert request" into ics-mr1Selim Gurun2011-12-082-11/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Prevent native crashes on client cert requestSelim Gurun2011-12-072-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4586251 Explicitly manage ref counter for WebUrlLoaderClient. This will prevent early release of the object. Change-Id: I4b8e41b470eaacb594ce85afdd650e7827ab4a6d
* | | | | am e50c6da1: Merge "Revert change that caused text in floating divs to not ↵Mangesh Ghiware2011-12-071-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | reflow." into ics-mr1 * commit 'e50c6da15806ff91b5e9298cb303f2b8f9ae6b35': Revert change that caused text in floating divs to not reflow.
| * | | | Merge "Revert change that caused text in floating divs to not reflow." into ↵Mangesh Ghiware2011-12-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ics-mr1
| | * | | | Revert change that caused text in floating divs to not reflow.Mangesh Ghiware2011-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5455817 (Text reflow not working in browser) Change-Id: I2a62a7fb4c7acde640cd87b8d0f03200b8f7fc2f
| * | | | | Merge "Fix the repaint inval mechanism for layers - DO NOT MERGE" into ics-mr1Nicolas Roard2011-12-073-4/+15
| |\ \ \ \ \
| | * | | | | Fix the repaint inval mechanism for layers - DO NOT MERGENicolas Roard2011-12-073-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only keep the scrollable layers invalidating their entire area instead of incurring this penalty for *all* layers. Also remove unnecessary repaint when scrolling (we have the entire content on the UI side already). While the entire scrollable area will be invalidated and marked as dirty, the existing code in PaintedSurface already only look at the visible tiles of scrollable layers to consider the layer's content as being ready to display, so the real world penalty (while far from optimal) is limited. Implementing the correct approach (only invalidating what really changed on scrollable layers) would sadly be a lot more complex, as currently webkit will *not* send us the repaint invals if they are on a currently clipped area, as webkit's default behaviour to implement scrolling of such element is to repaint them anyway... bug:5721618 Change-Id: Ia470157c716fa1c557e4a196ba014296ad9e627a
* | | | | | | am 1d9cab1b: Merge "Fix crash" into ics-mr1John Reck2011-12-071-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '1d9cab1bc5a505a47c7a314699520dcd56ee9d4f': Fix crash
| * | | | | | Merge "Fix crash" into ics-mr1John Reck2011-12-071-3/+6
| |\ \ \ \ \ \
| | * | | | | | Fix crashJohn Reck2011-12-071-3/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5727901 Change-Id: Ic2323eca6bc6e77fe428f3602800799e7b996cce
* | | | | | | am 84117244: Merge "fix viewport lagging a drawGL call behind" into ics-mr1Chris Craik2011-12-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '84117244fe33b7de6e83c691f4f4bc7f0db0f32b': fix viewport lagging a drawGL call behind
| * | | | | | Merge "fix viewport lagging a drawGL call behind" into ics-mr1Chris Craik2011-12-071-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fix viewport lagging a drawGL call behindChris Craik2011-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5724482 bug:5660963 we were calling setViewport and setViewRect out of order, so we were clipping with the last frame's (or last webview's, if >1 were visible) projection matrix Change-Id: Ifcbfa0021cb33e3400ac9eaf64fc2235ee8afe50
* | | | | | | am f288ebbc: Merge "Account for dirty tiles doubly in texture counting" into ↵Chris Craik2011-12-071-2/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | ics-mr1 * commit 'f288ebbc0f8b160082a78668df554a4ae7192e11': Account for dirty tiles doubly in texture counting
| * | | | | Merge "Account for dirty tiles doubly in texture counting" into ics-mr1Chris Craik2011-12-071-2/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Account for dirty tiles doubly in texture countingChris Craik2011-12-061-2/+13
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5704511 Dirty tiles use two textures - one for display, and one for painting. This fixes an issue where the number of textures requested did not meet the needs of a double buffered tree with most content invalidated. The webview would give up drawing, and thus not paint the invalidated portions of the layers. Change-Id: Icd9b9e0b53cf82415074dac4338a8c48de880364
* | | | | am 5b792777: Remove unneeded PictureSet clearNicolas Roard2011-12-061-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5b7927778dc52a2279927acdbef479ca994c843e': Remove unneeded PictureSet clear
| * | | | Remove unneeded PictureSet clearNicolas Roard2011-12-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5720732 Change-Id: Iaf3a41adaa0799867a615b42d1d603aca3c8e35d
* | | | | am c8ec6fac: Merge "Support spellcheck on text areas" into ics-mr1John Reck2011-12-061-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c8ec6fac3055c0cb85047eb31c7c6459d28aa1c4': Support spellcheck on text areas
| * | | | Merge "Support spellcheck on text areas" into ics-mr1John Reck2011-12-061-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Support spellcheck on text areasJohn Reck2011-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5719053 Change-Id: I5f69e411d2ade2eaaf5c9e9e39dc8dc7d23425f1
* | | | | am 1d71a5f4: Merge "Don\'t deep copy animations, prepare animations on both ↵Chris Craik2011-12-066-102/+33
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | trees" into ics-mr1 * commit '1d71a5f4405639dece648eda291ab6a2aecbb968': Don't deep copy animations, prepare animations on both trees
| * | | | Merge "Don't deep copy animations, prepare animations on both trees" into ↵Chris Craik2011-12-066-102/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ics-mr1
| | * | | | Don't deep copy animations, prepare animations on both treesJohn Reck2011-12-056-102/+33
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5699085 Previously, animations were copied along with layer trees from the webkit to UI thread. This changes that to instead use a single object per animation with refcounting so that animations are kept consistent. Additionally, animations are now run on both the painting and drawing trees in the tree manager so that animated content clipped correctly during a tree swap. Change-Id: I79f0c0e47b717f9fdddf303eb7ec29efc4950aaf
* | | | | Merge "compiler error fix when DEBUG is on"Teng-Hui Zhu2011-12-063-5/+4
|\ \ \ \ \
| * | | | | compiler error fix when DEBUG is onTeng-Hui Zhu2011-12-063-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifaaefdbe0724a95e9c237c1fe3c5a7c25026839e
* | | | | | am c34cfbd2: Delete TextureGenerator operations outside the lockChris Craik2011-12-061-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'c34cfbd2a0063c85afcf6751478987b8c6b6f7e1': Delete TextureGenerator operations outside the lock
| * | | | | Delete TextureGenerator operations outside the lockChris Craik2011-12-051-4/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5713701 This fixes a potential deadlock between TextureGenerator and ImagesManager Change-Id: I57503d3b73aff571629826f2278491232b37cb67