summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fix anti-aliasing issues with dashed linesDerek Sollenberger2012-04-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bitmap shader used for dashed lines needs to be filtered and anti-aliased to be visually consistent at different zoom levels. bug: 5869305 Change-Id: Iefca8fae776a353976bd77fd3f53bea7acc7d952
* | | | | | | | | am 2c3ac3ef: Merge "Cherrypick WebKit r94508." into jb-devVictoria Lease2012-05-078-5/+58
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c3ac3ef31c36dba2fd46d8f94658e6d00283f9f': Cherrypick WebKit r94508.
| * | | | | | | | 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
* | | | | | | | | | am 5331af46: Merge "Ensure updateGLPositionsAndScale is called from ↵George Mount2012-05-075-11/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateLayerPosition." into jb-dev * commit '5331af464fa0f4a08cbfe84f1de2ebab0038f2c1': Ensure updateGLPositionsAndScale is called from updateLayerPosition.
| * | | | | | | | | 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
* | | | | | | | | | am e712b54e: Merge "Broaden fast inval path" into jb-devJohn Reck2012-05-063-32/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e712b54e831d077c789984b8206f64d81dbceaa2': Broaden fast inval path
| * | | | | | | | | 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
* | | | | | | | | | | am c4ea1619: Merge "Simplify hierarchy with fixed background Preliminary ↵Nicolas Roard2012-05-042-35/+49
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for color background." into jb-dev * commit 'c4ea1619cb3bb0af9e7b69d6a72da772d71f5e9c': Simplify hierarchy with fixed background Preliminary support for color background.
| * | | | | | | | | | 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
* | | | | | | | | | | am 38c83730: Merge "Unify the naming of rectangles used for draw." into jb-devTeng-Hui Zhu2012-05-0423-314/+346
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38c837307303e521ec0d1c9f7c0df7bd78dd53a5': Unify the naming of rectangles used for draw.
| * | | | | | | | | | 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
* | | | | | | | | | | | am 67cb7db0: Merge "Bump WebView font cache size to 1.5MB for better ↵Derek Sollenberger2012-05-041-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | performance." into jb-dev * commit '67cb7db03e4f08f46b76d8526aaa62e3725fe79a': Bump WebView font cache size to 1.5MB for better performance.
| * | | | | | | | | | | 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
* | | | | | | | | | | am 897f9bc8: Merge "Fix the matrix" into jb-devJohn Reck2012-05-031-12/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '897f9bc8d6e51ba1d0209f219e4c98c8565927e9': Fix the matrix
| * | | | | | | | | | 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
* | | | | | | | | | am c896f84c: Merge "Fixed single-surface rendering with fixed-background ↵Nicolas Roard2012-05-032-6/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements" into jb-dev * commit 'c896f84c19de80a82235a1ee89abe8076a91296c': Fixed single-surface rendering with fixed-background elements
| * | | | | | | | | 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
* | | | | | | | | | am c5342b1c: Merge "Respect clipping for CanvasLayer" into jb-devJohn Reck2012-05-031-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5342b1cfa0d6bf775c53aacd13f90362da78c37': Respect clipping for CanvasLayer
| * | | | | | | | | 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
* | | | | | | | | | am 2f108e04: Merge "Fix null pointer crash" into jb-devJohn Reck2012-05-031-1/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f108e0434f1ded75cabc768d8087c568e971557': Fix null pointer crash
| * | | | | | | | | 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
* | | | | | | | | | am 93b1f920: Merge "Fix mapLayerRect to modify the mapped rectangle." into ↵George Mount2012-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '93b1f920c29dd2af08dc086ba0646cf124e81e1a': Fix mapLayerRect to modify the mapped rectangle.
| * | | | | | | | | 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
* | | | | | | | | Merge "Remove the FIXME item in shouldBreakAfter() of break_line.cpp."claireho2012-05-031-20/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove the FIXME item in shouldBreakAfter() of break_line.cpp.claireho2012-04-301-20/+12
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6388728 - Improper line break of Japanese text The FIXME item in shouldBreakAfter() is a temporary workaround for webkit bug #17411 due to Unicode5.0 does not define IdeographicComma(U+3001) and ideographicFullStop(U+3002) as line breaks. However, shouldBreakAfter() hard coded these 2 codepoints should have a line break regardless any other punctuation right after these 2 characters. Now, Android is using ICU4.8.1 that is against on Unicode6.0. IdeographicComma and ideographicFullStop are included in the external/icu4c/data/unidata/LineBreak.txt. It is safe to remove this temporary workaround. Change-Id: Ie419e5e785bd15eeebf4380237e1418f6a2474ea
* | | | | | | | | am e859a341: Rewrite PictureSet with TURBO!John Reck2012-05-0242-1877/+850
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e859a34171f2a36877d95197d118d962078f8aa0': Rewrite PictureSet with TURBO!
| * | | | | | | | 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
* | | | | | | | | am 8a3e157b: Merge "Don\'t create a new functor if old one exists" into jb-devChris Craik2012-05-021-3/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a3e157baecb453158df1f7bc81bfb4704448b2e': Don't create a new functor if old one exists
| * | | | | | | | 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
* | | | | | | | | | am fa397623: Merge "Workaround a crash" into jb-devTeng-Hui Zhu2012-05-021-2/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa3976234409edb5477e8950204c597cf2a6dda9': Workaround a crash
| * | | | | | | | | 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
* | | | | | | | | | | am e0b5cd3a: Merge "Fix max texture setup" into jb-devTeng-Hui Zhu2012-05-023-62/+58
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0b5cd3a7762688630b380296675a47aa013992d': Fix max texture setup
| * | | | | | | | | | 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
* | | | | | | | | | | am 3c1b0d2c: Merge "fix monkey scrolling crash" into jb-devChris Craik2012-05-011-12/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c1b0d2c8aafda4e7dc136c27f28cf2e95dc9125': fix monkey scrolling crash
| * | | | | | | | | | 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