summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Get rid of unnecessary glFinish"Teng-Hui Zhu2011-09-221-2/+0
|\
| * Get rid of unnecessary glFinishTeng-Hui Zhu2011-09-211-2/+0
| | | | | | | | | | bug:5347539 Change-Id: Iac3888afe1130043e7800e623dd6e061ecf6f40d
* | Port Webkit r74089 to GraphicsContextAndroid.Ben Murdoch2011-09-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | Port the change made to PlatformContextSkia in http://trac.webkit.org/changeset/74089 to GraphicsContext Android. This fixes the rendering of inset box shadows. Bug: 5351383 Change-Id: I7b68c965aec87e610d853a8220468fd8113351e6
* | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-220-0/+0
|\ \ | | | | | | | | | Change-Id: I114e6f3e54ba6d293aebfbaf560170e0728ca3a1
| * \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-210-0/+0
| |\ \
* | \ \ Merge "Clean up style and add some comments in Layer"Steve Block2011-09-224-61/+38
|\ \ \ \
| * | | | Clean up style and add some comments in LayerSteve Block2011-09-214-61/+38
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is preparation for https://android-git.corp.google.com/g/#/c/134488/4 Refactoring only, no functional change. Bug: 5262656 Change-Id: I44e362cf35fc5080f7d9fba34183188d3a2a6331
* | | | Merge "Post a full WebView inval when we navigate to a new page."Ben Murdoch2011-09-222-5/+5
|\ \ \ \
| * | | | Post a full WebView inval when we navigate to a new page.Ben Murdoch2011-09-212-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than just posting an inval when we start to load a new page, we should do so on any new intra-page navigation, so that we cover cases that don't originate from Java. For example, when navigating the page cache. Bug: 5266447 Change-Id: I035ddcd9ef7d06a69a8adfe89cba75be7c502edb
* | | | | Merge "Prefetch browser content with tiled page"Chris Craik2011-09-215-0/+74
|\ \ \ \ \
| * | | | | Prefetch browser content with tiled pageChris Craik2011-09-215-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5262519 Use the tiled page not used by content rendering to render much fewer tiles for the same content, at an inflated scale. These prefetched tiles are prioritized for painting above all others, so that content is (almost) always visible on the base layer. Change-Id: I598b7925cb68beef632f828df3ae522a0b21e2b4
* | | | | | Merge "Increase default button padding"John Reck2011-09-211-3/+6
|\ \ \ \ \ \
| * | | | | | Increase default button paddingJohn Reck2011-09-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5354009 12 for left/right 8 for top/bottom Change-Id: Iec50b82b95d24b3a50c858017f52d52310c86ee9
* | | | | | | Merge "Prevent rings from being clipped"John Reck2011-09-212-3/+10
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Prevent rings from being clippedJohn Reck2011-09-202-3/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5348386 Change-Id: I6fd9c1d856be257a1a757649aa85e55d4a14a8d1
* | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-210-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | | Change-Id: Ia810d54c1fafa6502c251e6e5b3334a8c39e0a1a
| * | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-200-0/+0
| |\ \ \ \
* | \ \ \ \ Merge "Actually update the texture filter."Teng-Hui Zhu2011-09-201-2/+2
|\ \ \ \ \ \
| * | | | | | Actually update the texture filter.Teng-Hui Zhu2011-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5347539 Change-Id: Ic70f9a3d3d780ddf8c60bf51ee94e0b36f56c22e
* | | | | | | Merge "Support drawing the quad in GL_NEAREST mode."Teng-Hui Zhu2011-09-203-7/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Support drawing the quad in GL_NEAREST mode.Teng-Hui Zhu2011-09-203-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can save the draw call perf up to about 20-40% for each quad. We should make more draw calls using NEAREST mode when it is 1 to 1 mapping. bug:5347539 Change-Id: I1ae206716f2b1352775e0079e25e54f46bc18578
* | | | | | | Merge "A better CPU upload path"Teng-Hui Zhu2011-09-201-7/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | A better CPU upload pathTeng-Hui Zhu2011-09-201-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the unnecessary Surface Texture operation in CPU upload code path. bug:5347539 Change-Id: Id8cf1d3e472dce2470bc62a844b95e8d5d2a6371
* | | | | | | am 6d611101: (-s ours) Merge "DO NOT MERGE:Share the display from the UI ↵Teng-Hui Zhu2011-09-200-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread" into ics-factoryrom * commit '6d611101f901fbf23e794fe37693e5904ed9a2bb': DO NOT MERGE:Share the display from the UI thread
| * | | | | | Merge "DO NOT MERGE:Share the display from the UI thread" into ics-factoryromTeng-Hui Zhu2011-09-202-13/+27
| |\ \ \ \ \ \
| | * | | | | | DO NOT MERGE:Share the display from the UI threadTeng-Hui Zhu2011-09-192-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently disable the wait b/c b/5332112. For now it should be the same functionality as the original workaround by using glDraw. cherry pick from master c/135811/ bug:5270526 Change-Id: I1973188d8f86ea28e684d14bca794b2a61dac34c
* | | | | | | | Merge "Reapply: Fix for bug 5226268 [Browser] http keep-alive packets DO NOT ↵Ben Murdoch2011-09-201-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | MERGE"
| * | | | | | | Reapply: Fix for bug 5226268 [Browser] http keep-alive packets DO NOT MERGEKristian Monsen2011-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling SPDY as part of not reusing connections Also needs the following CL in external/chromium: https://android-git.corp.google.com/g/#/c/135472/ Change-Id: If69a5c4ba3965c0465808b13a51f9221fdf4e639
* | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-200-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | Change-Id: Ib1851b27f90fa70a31e3f4b3abaa2aff59f54372
| * | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-200-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
* | | | | | am 5cfbc58a: (-s ours) Cherry-pick fix for rect sizes from master - do not mergeBen Murdoch2011-09-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5cfbc58a9c1b7639519272029d1d3aa452723685': Cherry-pick fix for rect sizes from master - do not merge
| * | | | | Cherry-pick fix for rect sizes from master - do not mergeBen Murdoch2011-09-191-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalidation rect sizes When splitting the invalidation rect over the tiles that it invalidates, we need to use the tile's offset to calculate the top/left co-ordinate in the case that the inval rect only covers part of the tile. (See change Ie3b4be68 for the regression) Bug: 4965594 Cherry-pick of: 1672c0ff79526ae74ab745724fa57c877811d071 Change-Id: I6a18f1d3d223f5389b0f4f35fab9e579f499e9da
* | | | | | am ab7f5033: (-s ours) Cherry-pick fix for renamed asset from master - do ↵Teng-Hui Zhu2011-09-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not merge * commit 'ab7f5033f435437499cefc7066915f88a7f1cae9': Cherry-pick fix for renamed asset from master - do not merge
| * | | | | Cherry-pick fix for renamed asset from master - do not mergeTeng-Hui Zhu2011-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the missing controller for inline video. Bug:5340451 Cherry pick of: 9062292ef8421fc64437c478064f2ba21515ddc8 Change-Id: Ifd706f61f824d1019f998569774b600ae9a9f5b9
* | | | | | am d6b2e695: (-s ours) Cherry-pick "Fix missing tiles" from master - do not ↵Chris Craik2011-09-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge * commit 'd6b2e6954f8448ca1940a17a9f891cd1e6032f2c': Cherry-pick "Fix missing tiles" from master - do not merge
| * | | | | Cherry-pick "Fix missing tiles" from master - do not mergeChris Craik2011-09-192-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5288530 Fix issue where stealing a back texture from a tile (while the tile was ready to swap) wouldn't mark tile as dirty. Now, mark tile dirty whenever texture is stolen from it, and avoid trying to steal busy textures. Cherry-pick of CL: 6aa089bded6a1abbf8d61264588e1e3a32be31b3 Change-Id: Iacbda17ba4b4c6382ceb1c84a6e5f02e609a76a5
* | | | | | Merge "Fix missing tiles"Chris Craik2011-09-192-16/+28
|\ \ \ \ \ \
| * | | | | | Fix missing tilesChris Craik2011-09-192-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5335634 Fix issue where stealing a back texture from a tile (while the tile was ready to swap) wouldn't mark tile as dirty. Now, mark tile dirty whenever texture is stolen from it, and avoid trying to steal busy textures. Change-Id: Iacbda17ba4b4c6382ceb1c84a6e5f02e609a76a5
* | | | | | | Merge "Fix the missing controller for inline video."Teng-Hui Zhu2011-09-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix the missing controller for inline video.Teng-Hui Zhu2011-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:5340451 Change-Id: Ifd706f61f824d1019f998569774b600ae9a9f5b9
* | | | | | | | Merge changes Ifb6cc64e,I4d819cc5Steve Block2011-09-198-28/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Simplify logic in ScrollableLayerAndroid::scrollTo() Fixes style and adds some comments to layers code
| * | | | | | | Simplify logic in ScrollableLayerAndroid::scrollTo()Steve Block2011-09-191-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional change Bug: 5262656 Change-Id: Ifb6cc64e7578625acc1d5e91b8296b9e4cf1d449
| * | | | | | | Fixes style and adds some comments to layers codeSteve Block2011-09-197-24/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes FrameCachePermission::AllowNewest. This should have been removed as part of https://android-git.corp.google.com/g/#/c/2712. Bug: 5262656 Change-Id: I4d819cc5087653e4a1180d04ca0b5b20db7e2305
* | | | | | | | Merge "Check for null selection in modifySelection"Russell Brenner2011-09-191-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Check for null selection in modifySelectionRussell Brenner2011-09-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MoveSelection and supporting routines have appeared in one-off crash reports for monkey runs. It's not yet clear whether or not these conditions are human-reproducible, but returning an empty string when a null selection is unexpectedly encountered in modifySelection() should make the release build somewhat safer, while asserting in the debug build. Bug: 5244036 Change-Id: I4d492286cebf9884da0c675aa71175b8aa39f4b9
* | | | | | | | | Merge "We be GL ringing it all over them layers"John Reck2011-09-195-73/+101
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | We be GL ringing it all over them layersJohn Reck2011-09-195-73/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5333083 Change-Id: Ia2b03d8d9e0167d06f8a900152e25e66372acd59
* | | | | | | | | | Merge "Prepare tiles in reverse draw order"Chris Craik2011-09-193-4/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Prepare tiles in reverse draw orderChris Craik2011-09-193-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5335634 By preparing tiles in the reverse of draw order, tiles on top are given textures first and less likely to be missing. Change-Id: Idafde3e0789e24459bba2db150081969810a0021
* | | | | | | | | | Merge "Fix find-in-page to scroll to search results in layers"Steve Block2011-09-193-16/+38
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
generated by cgit v1.1 at 2025-05-31 14:04:39 +0000