summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Temporary workaround to fix a bug on google.comNicolas Roard2012-04-061-1/+3
| | | | Change-Id: Ie03798396ed7df6fea6cb2ae7e1f7ae327409139
* Reorganize platform/graphics/androidNicolas Roard2012-04-06105-52/+56
| | | | Change-Id: Idc67155cfa99784dcd931e705336bfa063ecae46
* Merge "Implements a recording GraphicsContext"Nicolas Roard2012-04-0625-1215/+2961
|\
| * Implements a recording GraphicsContextNicolas Roard2012-04-0625-1215/+2961
| | | | | | | | Change-Id: I41feadb23dce25af321331c459eb159c6141831b
* | TransferQueue: use BufferQueue::setBufferCountJamie Gennis2012-04-061-3/+6
| | | | | | | | | | | | | | | | This change switches the TransferQueue to use the BufferQueue::setBufferCount method rather than the SurfaceTexture method. The SurfaceTexture method has been removed as part of the SurfaceTexture refactoring. Change-Id: I906b710b426d91181d73be18fc0aeefd514d3c91
* | Merge "Merging drawLayerQuad and drawQuad"Teng-Hui Zhu2012-04-0515-151/+324
|\ \
| * | Merging drawLayerQuad and drawQuadTeng-Hui Zhu2012-04-0515-151/+324
| |/ | | | | | | | | | | | | | | Simplify the draw interface, organize the data for draw in a better way. Add a forceBlending from Tile to make sure translucent background can force blending too. Change-Id: I3baa16cbdd8fda6fb4ab4087b74a1e0c9aa1e81b
* | Merge "minor cleanup"Chris Craik2012-04-056-25/+7
|\ \
| * | minor cleanupChris Craik2012-04-056-25/+7
| |/ | | | | | | Change-Id: Ib873df1bb3e7a76a5a34acc89e4deff217e698e0
* | Merge "Avoid leaking a JNI local ref in JavaInputStreamWrapper::read()"Steve Block2012-04-051-36/+28
|\ \
| * | Avoid leaking a JNI local ref in JavaInputStreamWrapper::read()Steve Block2012-04-051-36/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we release the local ref returned by NewByteArray() once we've taken a global ref to the array. Also fix up the rest of the file to use ScopedLocalRef to avoid this kind of problem in future. Bug: 5498704 Change-Id: I33754a0188a3c08a5c34d0e161cd7073f83070c6
* | | Cleanup unnecessary codeTeng-Hui Zhu2012-04-041-5/+0
| |/ |/| | | | | Change-Id: I420b9fc5793c0df923229443dd2863e2d36612b6
* | Merge "Rename several classes"Chris Craik2012-04-0452-607/+731
|\ \
| * | Rename several classesChris Craik2012-04-0452-607/+731
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BaseTile,BaseTileTexture -> Tile,TileTexture Used in layers other than the base LayerGroup -> Surface Renamed to convey that it is a member of the SurfaceCollection, and that the layers grouped inside are painted together (if at all) DualTiledTexture -> SurfaceBacking Better conveys that this is the raster backing for a surface that can paint. It may be implemented with two tiled textures for now, but that isn't as important as its relationship to the surface. TiledTexture -> TileGrid Renamed to make it more clear that it was a container of tiles, and to be less similar to TileTexture Change-Id: I843f8603a2080cfe5a7313ba1c2eff10620f8aa2
* | | Oops! Double negative in previous change.Amith Yamasani2012-04-041-1/+1
| | | | | | | | | | | | Change-Id: I948679e429018550e8b7fb867a8c24edc61b443f
* | | Merge "Small change in a structure used for storing nine patch info."Amith Yamasani2012-04-041-1/+1
|\ \ \ | |/ / |/| |
| * | Small change in a structure used for storing nine patch info.Amith Yamasani2012-04-041-1/+1
| | | | | | | | | | | | | | | Bug: 6087201 Change-Id: I2ff23f7b6f8ba13f8e5593d81d2576ef60c5930d
* | | Merge "Cherry pick webkit change r95090 to fix HashMap/StringHash include ↵Chris Craik2012-04-042-2/+3
|\ \ \ | |_|/ |/| | | | | problems"
| * | Cherry pick webkit change r95090 to fix HashMap/StringHash include problemsChris Craik2012-04-042-2/+3
| | | | | | | | | | | | Change-Id: I61f2cc831b962913b0cf8ac9ace8fdfe6f3d05c0
* | | Use new draw-less functor execution mode to do work without redrawingTeng-Hui Zhu2012-04-028-78/+89
|/ / | | | | | | | | | | Depends on frameworks/base change https://android-git.corp.google.com/g/#/c/177934/ Change-Id: I9154017ef2990b3bebd038cabcaf3d93c9df14d8
* | Merge "Translucent background color support for webview"Teng-Hui Zhu2012-04-0215-43/+150
|\ \
| * | Translucent background color support for webviewTeng-Hui Zhu2012-04-0215-43/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to respect the background color set for webview and combine that with the CSS background. Since we are tiled based and need to avoid double drawing, we need to determine the areas not covered by available tiles and draw the background. This involves a bit computation overhead. Therefore, we only compute those areas when alpha is between 1 to 254. When alpha is 255, we just need a glClear. When alpha is 0, nothing need to be drawn. Due to the fact that the tile can be partially drawn, texture generator need to know the background color to clear the tiles for the base layer. bug:5684832 Change-Id: I51f9d219f2722cc088eeea603623f9660f7a136a
* | | Don't show keyboard on focus change.George Mount2012-04-022-5/+7
| | | | | | | | | | | | | | | | | | | | | Bug 6270400 Framework Change: I2aa65b405b3a394b55821a4d688afeb22244c2c7 Change-Id: I1f06b7220e22665f5932928855c81eca6534bf2f
* | | Merge "Remove unused FORM_DID_BLUR hooks."George Mount2012-04-023-29/+1
|\ \ \ | |/ / |/| |
| * | Remove unused FORM_DID_BLUR hooks.George Mount2012-04-023-29/+1
| |/ | | | | | | | | | | | | Bug 6111763 Framework Change: I56a862a6c0f0d7799f4e935bb7f5103bb2edbb9b Change-Id: I015e1a57e81e897c124af5d96ba76b4d07a381fc
* | Merge "Add back low res base layer rendering, and expanded bounds prefetching"Chris Craik2012-03-3013-118/+146
|\ \
| * | Add back low res base layer rendering, and expanded bounds prefetchingChris Craik2012-03-3013-118/+146
| | | | | | | | | | | | Change-Id: Ib6a38d8dd8223bdca9cb652771f0b19dbec892dc
* | | Merge "Line spacing for vertical writing mode."claireho2012-03-301-2/+6
|\ \ \
| * | | Line spacing for vertical writing mode.claireho2012-03-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6081283 - Line spacing for Japanese (vertical writing) isn't aligned well. 1. The initial value for line-spacing should be ascent + decent + line gap. 2. If the line-gap is zero, we use the avgCharWidth for line gap to avoid the no spaces between vertical lines. Change-Id: I3d21d6d9a222e73d972f8c0ffb77eb420ac175e8
* | | | add enable/disable switch for link prefetch to WebSettingsVictoria Lease2012-03-304-0/+31
| |/ / |/| | | | | | | | | | | Bug: 5218987 Change-Id: Ie88a117e52d1835114415ee6721108d8a882594a
* | | Merge "Add missing paintingDisabled() checks"John Reck2012-03-291-0/+28
|\ \ \
| * | | Add missing paintingDisabled() checksJohn Reck2012-03-291-0/+28
| | |/ | |/| | | | | | | | | | | | | Bug: 6236131 Change-Id: I9fc4e166413ff70692f4414912c2613834387e33
* | | Merge "Clip canvas to layer content on a draw."Mangesh Ghiware2012-03-293-4/+9
|\ \ \ | |/ / |/| |
| * | Clip canvas to layer content on a draw.Mangesh Ghiware2012-03-293-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6150903 Also, fix the visual indicator box coordinates to display right and bottom edges. Change-Id: I269f4dd3ae55eed77d9cbe67950c28ce1c789a51
* | | Merge "Fix m.youtube.com thumbnails"John Reck2012-03-284-38/+75
|\ \ \ | |/ / |/| |
| * | Fix m.youtube.com thumbnailsJohn Reck2012-03-284-38/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6231946 Optimize the use of a non-changing canvas Tighten up error handling Enforce minimum size to use SurfaceTexture Change-Id: I8ad553ff5727d68e56bc1343213b4a41472390f1
* | | Snap selection handles to text.George Mount2012-03-284-15/+96
| | | | | | | | | | | | | | | | | | | | | Bug 6198286 Framework Change: I3c51ed5f6988d58440badfbe8b076fd83d48ae2a Change-Id: I55604f3ec28586beaec5fd98a27c9f4b8a59a8a5
* | | Merge "Remove using namespace from WebViewCore.h"John Reck2012-03-272-61/+75
|\ \ \ | |_|/ |/| |
| * | Remove using namespace from WebViewCore.hJohn Reck2012-03-272-61/+75
| |/ | | | | | | Change-Id: Ia19117c876165a65f508d236193392940142d429
* | Pause webkit painting betterJohn Reck2012-03-271-1/+1
|/ | | | Change-Id: Id548766ccd56781228e5795588ac783f3313f960
* Merge "Further clean up for baselayer merge"Teng-Hui Zhu2012-03-266-67/+46
|\
| * Further clean up for baselayer mergeTeng-Hui Zhu2012-03-226-67/+46
| | | | | | | | | | | | | | | | | | 1. Require a layer for every SurfaceCollection Now we don't need the null check any more. 2. drawBackground only in SurfaceCollectionManager. Change-Id: I3bbebac86e41a2367a05f71cffdc6cd72fda7506
* | Merge "Platform graphics refactor"John Reck2012-03-239-980/+1279
|\ \
| * | Platform graphics refactorJohn Reck2012-03-239-980/+1279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Push the bulk of the work to PlatformGraphicsContext PlatformGraphicsContext does not depend on having a GraphicsContext Get ImageAndroid::drawPattern off of mCanvas Get BitmapImage::draw off of mCanvas Get WebFrameView off of mCanvas Cleanup GradientAndroid and remove mCanvas usage Change-Id: I3c8ad10c030cbc384436463e197ca1c0a69d34eb
* | | Merge "Use the right opacity"Chris Craik2012-03-231-1/+1
|\ \ \
| * | | Use the right opacityJohn Reck2012-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6220093 Change-Id: Ie617a29ea8f0b28d69dfc29d1435f1fedade1ef9
* | | | Merge "add missing include"Mathias Agopian2012-03-231-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | add missing includeMathias Agopian2012-03-231-0/+1
| |/ / | | | | | | | | | Change-Id: Iec9f7f7ee481f105fd15d521393faf26f76b9adc
* | | Fix TilesManager race conditionJohn Reck2012-03-234-29/+13
|/ / | | | | | | Change-Id: Ibbb8d6fa7565cf7d2205b28c8a9e870eb338ea14
* | Merge "reimplement BaseLayerAndroid as a LayerAndroid subclass"Chris Craik2012-03-2347-1756/+311
|\ \ | |/