summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Cherrypick WebKit r95959.Victoria Lease2012-05-071-1/+7
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/95959 This, in conjunction with WebKit r94508, addresses our issue involving referencing deleted fonts. Bug: 6105670 Change-Id: Ida486c92d33aee792486f49e784f64d978e2fb81
* | | | | Merge "Cherrypick WebKit r94508." into jb-devVictoria Lease2012-05-078-5/+58
|\ \ \ \ \
| * | | | | Cherrypick WebKit r94508.Victoria Lease2012-05-048-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/94508 This, in conjunction with WebKit r95959, addresses our issue involving referencing deleted fonts. Bug: 6105670 Change-Id: Ica4c89046ed47e2c75d13640a27ac92f2aad6709
* | | | | | Merge "Ensure updateGLPositionsAndScale is called from updateLayerPosition." ↵George Mount2012-05-075-11/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | into jb-dev
| * | | | | Ensure updateGLPositionsAndScale is called from updateLayerPosition.George Mount2012-05-045-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6436989 The layer transform was not being updated quickly enough after a draw, causing the thumb selection handle to become misplaced. Change-Id: I6cd33baaaba258c9d0977f06e7793ade2816b95d
* | | | | | Merge "Broaden fast inval path" into jb-devJohn Reck2012-05-063-32/+41
|\ \ \ \ \ \
| * | | | | | Broaden fast inval pathJohn Reck2012-05-043-32/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6445600 Clip fast partial invals to the screen instead of an arbitrary size limit Change-Id: Iafcbcb427566db87420b8bfc54eb9148530913ce
* | | | | | | Merge "Simplify hierarchy with fixed background Preliminary support for ↵Nicolas Roard2012-05-042-35/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | color background." into jb-dev
| * | | | | | Simplify hierarchy with fixed backgroundNicolas Roard2012-05-042-35/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preliminary support for color background. bug:1352305 Change-Id: Ibd82017c18fd939b253d22a455aae484ea308544
* | | | | | | Merge "Unify the naming of rectangles used for draw." into jb-devTeng-Hui Zhu2012-05-0423-314/+346
|\ \ \ \ \ \ \
| * | | | | | | Unify the naming of rectangles used for draw.Teng-Hui Zhu2012-05-0323-314/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rects are referring to the same rect under different coordinates, so we just prefix the coordinates' name to differentiate the rects. This is pure refactor, no functional change. bug:6338456 Change-Id: Ic072a4f5aa56a25751e0151a697c0e31bca94ef5
* | | | | | | | Merge "Bump WebView font cache size to 1.5MB for better performance." into ↵Derek Sollenberger2012-05-041-0/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | jb-dev
| * | | | | | | Bump WebView font cache size to 1.5MB for better performance.Derek Sollenberger2012-05-031-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 6226962 Change-Id: I3c705e50b7204df6be732422a8fcacacaf5ce7e9
* | | | | | | Merge "Fix the matrix" into jb-devJohn Reck2012-05-031-12/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix the matrixJohn Reck2012-05-031-12/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6442353 SkNWayCanvas needs to be translated as well or it screws up our clipping Change-Id: Ic8bb64aaa796f5cff58b0fab15062e6c8f5f0d23
* | | | | | Merge "Fixed single-surface rendering with fixed-background elements" into ↵Nicolas Roard2012-05-032-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | jb-dev
| * | | | | | Fixed single-surface rendering with fixed-background elementsNicolas Roard2012-05-032-6/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In single-surface rendering, we did not paint the surface collection correctly if there was more than one child on the base surface (which is the case with fixed-background elements). Change-Id: I6e8d34630060414159b5f13cd302c1dc2165a048
* | | | | | Merge "Respect clipping for CanvasLayer" into jb-devJohn Reck2012-05-031-2/+2
|\ \ \ \ \ \
| * | | | | | Respect clipping for CanvasLayerJohn Reck2012-05-031-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6422177 Change-Id: I04bb713bd217f1c8776b2aa46f329ef413b7d36b
* | | | | | Merge "Fix null pointer crash" into jb-devJohn Reck2012-05-031-1/+3
|\ \ \ \ \ \
| * | | | | | Fix null pointer crashJohn Reck2012-05-031-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6436745 Change-Id: I7225fbb3c05d9c8ea79180740bbf1b5f3faf6ead
* | | | | | Merge "Fix mapLayerRect to modify the mapped rectangle." into jb-devGeorge Mount2012-05-031-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix mapLayerRect to modify the mapped rectangle.George Mount2012-05-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6434432 Change-Id: I42181f232332e4c015ed403d53248b9e0b787043
* | | | | Rewrite PictureSet with TURBO!John Reck2012-05-0242-1877/+850
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes how partial invals are done by adding a hybrid mode. What we used to do is generate a SkPicture for the new area. This SkPicture would possibly be larger than the actual inval, depending on various merge rules (more SkPictures == slower to draw a tile) The new code rewrites PictureSet entirely, preserving many of the old rules but cleans up the code and adds the concept of a "PrerenderedInval". This is a partial inval that WebKit has rasterized. By having WebKit produce both a SkPicture and a SkBitmap, we avoid needing to play back the picture and avoid overdrawing. We take this SkBitmap, and simply update the front textures with it. This gives us full partial invals through the entire system without hitting any driver bugs, and with minimal copies. And while the SkPicture may be larger than the inval, the SkBitmap that is rasterized is not - it matches the area webkit has said is dirty. Change-Id: Ieb7ecc9db0d4f679102fda004a43399f9b319ebc
* | | | | Merge "Don't create a new functor if old one exists" into jb-devChris Craik2012-05-021-3/+13
|\ \ \ \ \
| * | | | | Don't create a new functor if old one existsChris Craik2012-05-021-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6405861 Change-Id: Ife0dcc6416b18bbd50b4d244e6464f423f651de6
* | | | | | Merge "Workaround a crash" into jb-devTeng-Hui Zhu2012-05-021-2/+8
|\ \ \ \ \ \
| * | | | | | Workaround a crashTeng-Hui Zhu2012-05-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When content is empty, just minus an empty rect. bug:6404975 Change-Id: Ia12a64f93345bde7d3b92a99746b29e2e71bb652
* | | | | | | Merge "Fix max texture setup" into jb-devTeng-Hui Zhu2012-05-023-62/+58
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix max texture setupTeng-Hui Zhu2012-05-013-62/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5698410 Change-Id: Idff9cb52cabd4cc87427f975fee4968e779139bf
* | | | | | | Merge "fix monkey scrolling crash" into jb-devChris Craik2012-05-011-12/+12
|\ \ \ \ \ \ \
| * | | | | | | fix monkey scrolling crashChris Craik2012-05-011-12/+12
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6336994 Depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/186187/ Change-Id: Id9a179728a504a32b52bede9d30deb0dbeb39423
* | | | | | | Merge "Fix the clipping issue when webview has offset on X axis." into jb-devTeng-Hui Zhu2012-05-011-7/+40
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Fix the clipping issue when webview has offset on X axis.Teng-Hui Zhu2012-05-011-7/+40
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more comments to clarify the coordinate system. bug:6338952 Change-Id: Ia257c287040e638c3fa644a83ca1e97847bca70a
* | | | | Use different mechanism for enabling slider.George Mount2012-05-018-63/+95
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6413206 The HTML5 video scrubbing requires the old mechanism for getting touch events. Nearly a full revert of change I1d1ae457c50fe5b9627df7edb4f11d8245b5bdbf Change-Id: Ia3d07c1fddf5f5ed0f51a518c85f04bed415502e
* | | | Changes from code comments.George Mount2012-04-272-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6257532 Change-Id: Ic1c27ecdcbc6e4e6cf69dd73eb9b7b9a6d8b2c70
* | | | Merge "Don't crash on bad scale - DO NOT MERGE" into jb-devJohn Reck2012-04-271-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't crash on bad scale - DO NOT MERGEChris Craik2012-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | bug:5367327 bug:5826464 Change-Id: Ic15b3c28d610ba688f8c41e0782b3d0896b61fe2
* | | | Cherry-pick WebKit change r92025 to fix a rendering crashSteve Block2012-04-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/92025 Bug: 6328932 Change-Id: I2ed97a9f3d7d953f5a9bfe24b252124f896d31b4
* | | | Cherry-pick WebKit change r90130 to fix a rendering crashSteve Block2012-04-271-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/90130 Bug: 6328929 Change-Id: Iee0df9f81e1b73de0e1922b3b24e224389db8fa3
* | | | Cherry-pick WebKit change r88472 to fix a rendering crashSteve Block2012-04-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/88472 Bug: 6293530 Change-Id: I10bf2dfc6354d4e074a131e937aad04e0e6ca353
* | | | Merge "Disallow cookies for JavaScript when disabled." into jb-devGeorge Mount2012-04-261-3/+9
|\ \ \ \
| * | | | Disallow cookies for JavaScript when disabled.George Mount2012-04-251-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6363497 Change-Id: I97d6e7caf1820a624f92a12b69bd4ccfab80e0b9
* | | | | Merge "Make input="range" visible and react to touch events." into jb-devGeorge Mount2012-04-269-97/+98
|\ \ \ \ \
| * | | | | Make input="range" visible and react to touch events.George Mount2012-04-259-97/+98
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6257532 Change-Id: I1d1ae457c50fe5b9627df7edb4f11d8245b5bdbf
* | | | | Merge "On new content, attach functor directly" into jb-devJohn Reck2012-04-264-30/+24
|\ \ \ \ \
| * | | | | On new content, attach functor directlyChris Craik2012-04-254-30/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6323847 depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/184313/ Change-Id: I8f21317af746d501c92e338ce678434a2479576c
* | | | | Merge "Fix use after free" into jb-devJohn Reck2012-04-261-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix use after freeJohn Reck2012-04-261-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 6396295 Change-Id: I7c115a06ee7605956d205d1401b84d1118c8be85
* | | | Merge "Support partial draw in terms of a rect." into jb-devTeng-Hui Zhu2012-04-268-27/+49
|\ \ \ \